updated norm version with refactoring on QueryConditions