Implemented NVL in QueryBuilder; split QueryBuilder.java into multiple helper classes