Fix issue with context items referencing wrong entry