MDL-36255 core_grade: fix to ensure correct context used for filters