BS-8087
Add new Query expression editor