Separate out user row filtering into a filter and out of the transform