APPWTV-27

Still trying to fix issues with column masking