Reverted first part to string only, binary now gte/lt for query.