Added a class and enum for dynamic query searching purposes, the plan being to use 'partial' to indicate that it was close enough to be cloned and added to - thus merging can happen over time