pull field handling during query building into separate classes (Integer so far)