Improve search timing adjust

Related to issue #29.