fix missed search/replace when shifting over to common context function.