Refactor ZOOM_query to separate source