query includes

TODO move includes to query_options