issue #8 improve search