Finished up search with filtering