Only make queries (and their make fn) in one place