Fix for System-NS url