improve search a bit