When breaking the configuration of a faceted navigation node, it is not possible to fix it any more through the console

It seems to be related to the 'count' property (a virtual property on a physical node!) which has been added to the 'root' faceted navigation node for the 2.16.xx

Caused by: java.util.NoSuchElementException
at org.apache.jackrabbit.core.LazyItemIterator.next(LazyItemIterator.java:226)
at org.hippoecm.repository.decorating.RangeIteratorDecorator.next(RangeIteratorDecorator.java:114)
at org.hippoecm.repository.decorating.checked.RangeIteratorDecorator.next(RangeIteratorDecorator.java:144)
at org.hippoecm.repository.decorating.checked.PropertyIteratorDecorator.nextProperty(PropertyIteratorDecorator.java:47)
at org.hippoecm.frontend.model.properties.JcrPropertiesProvider.iterator(JcrPropertiesProvider.java:62)
at org.hippoecm.frontend.plugins.console.editor.NodeEditor$PropertiesFilter.load(NodeEditor.java:169)
at org.hippoecm.frontend.plugins.console.editor.NodeEditor$PropertiesFilter.size(NodeEditor.java:157)
at org.hippoecm.frontend.plugins.console.editor.NodeEditor$PropertyProvider.size(NodeEditor.java:133)
at org.apache.wicket.markup.repeater.data.DataViewBase.internalGetItemCount(DataViewBase.java:141)
at org.apache.wicket.markup.repeater.AbstractPageableView.getItemCount(AbstractPageableView.java:258)
at org.apache.wicket.markup.repeater.AbstractPageableView.getRowCount(AbstractPageableView.java:240)
at org.apache.wicket.markup.repeater.AbstractPageableView.getViewSize(AbstractPageableView.java:352)
at org.apache.wicket.markup.repeater.AbstractPageableView.getItemModels(AbstractPageableView.java:105)
at org.apache.wicket.markup.repeater.RefreshingView.onPopulate(RefreshingView.java:94)
at org.apache.wicket.markup.repeater.AbstractRepeater.onBeforeRender(AbstractRepeater.java:131)
at org.apache.wicket.markup.repeater.AbstractPageableView.onBeforeRender(AbstractPageableView.java:121)
at org.apache.wicket.Component.internalBeforeRender(Component.java:1061)
at org.apache.wicket.Component.beforeRender(Component.java:1095)
at org.apache.wicket.MarkupContainer.onBeforeRenderChildren(MarkupContainer.java:1727)
... 41 more