Removed context from ack searches.
Updated more files.