TEIIDDES-2274 Re-worked Row Filter and Column Masking logic