[TASK] Adjust querySettings