Search fixes and added filter option