updated TODO search from ack 2