Search functionality changed