CMS-1918 Fixes for BrowseFilterPanel