Issue #3274031: Fix Query String Encoding

Taras Kolodiyrequested to merge
issue/views_add_button-3274031:3274031-query-string-encoding into 2.0.x

Closes #3274031

Merge request reports