add to_query! for stricter validations