Handling faceted browsing (4855) feedback issues

#5184 
#5185 - WIP