Make URL matching more specific