Refactored add and remove transform. Getting all then iterating through the list in memory isn't really OK. Changed to be a query. Would like OS to retest please