Searching now uses numbers