MDL-30144 Assignmnet 2.2: fixed context retrival