Fixed issue with not resetting entry context data on new entry load. Closes #1338 See merge request !1092