added cleanable_query capabilities to the query method