Improve url catcher