small improvements to url-handlers