Convention searching improvements

The searching now has less math within the queries.