search functionality working
merged