#4716 removing deprecated usage of new BooleanQuery, using BooleanQuery.Builder instead