Simplify fix on url encoding for 4.4