include a clause for %2F case