feat(docadmin): adjust system queries (closes #4520)