Test deployment

search and filter has made many changes in test deployment that need to be reflected in master.