ECMS-6458 escape illegal character when searching
Merge commit 'f8bb099dc9eab9f9952ed2643a765b406674d571' into HEAD