Updates to remove excess text updates and produce lookup error indicators.
