[facet-navigation] Facet navigation tweaks and test improvement