Refactor some search stuff

the old comment (`# We only allow searching on one tag for now, and not a list.`) may be useful