Replace more hashes with Query objects