Add support for should_terms on query on domain object