Search functionality re-added