Minor tweaks to filter URL