Search functionality fixed