Fixing URL matching issue