Issue #3232745: Manually-added Query Tags in "Query Settings" are Lost when Changing Override Status of Query Options for any Display