Fix bug that inadvertantly applied context update to indexed field