@aiten @doodlemoonch Added definable where clauses and cleaned up old runners