modified search and filters