FLEX-987: added data mask replacement back in listing_address