Additional fixes for URL detection