fixes #14511 - bookmark editing ensures the query field is populated
(cherry picked from commit 008042331ccc6857c7c664fe70d43e3985918edc)
fixes #14511 - bookmark editing ensures the query field is populated
(cherry picked from commit 008042331ccc6857c7c664fe70d43e3985918edc)