Fixed #3035 Changed to rawurldecode() to skip '+' signs
Merge branch 'issue/3035'