oops: Fix ambiguous columns and email flags