Fix Search functionality