Expanded coverage for gt,ge,lt,le queries to cover any Comparable type. Added support for additional sort and query fields to be defined in the builders.