Fixed some facet related stuff
Search request mapping enhancements