After review, fix AdvancedQueryBuilder to allow the text field_query type to be set by the controller that instantiates it - as the staff and public use different types