Upgrade search functionality