Fixed issue with url params