Fixed issue with url rewrites