MACRO: Wraps a Query in a BooleanQuery so that it is required, along with a second optional clause which will match everything