Improved URL catching