Attempt to fix URL matching