Fixing up the urls / matching