Improved URL matching

URLs with trailing special chars (e.g. slash, minus, ...) should now be
matched correctly, even when followed by a non-url char