Improve search a bit