0031290: Change context object format for saving manual queries