Upgrade searches, refactor them to hooks