Fixed issue with removing querystring param