Resolve issue of URL masking