Fixed issue when other crap is in the url