Changed URL match

Matches more URL variations now