USE_ON_QUERY is an optional toggle field.

CLEANUP