Split ChangeTags::modifyDisplayQuery() to two smaller functions