Swapped out qwery with query (and qwery as fallback)