Bug fixes and added exposed_filter_criteria search