QueryBuilder implementation refactoring
QueryBuilder field handling specs