Search functionality now working