Add query to top-level props