Fixes: url handler

Fixes #968