Temporary hack due to URL quoting problems