Minor changes to StringCondition and StructuredQuery