Make searching work 100% fine