@seven1m these appear to be called before they are given to the data source, if this is correct wouldn't I be correct in assuming we don't need to handle cleansing/validation unless there is a master list of things that should never be in the query?