refactored elasticsearch Querybuilder build conditions