fix style errors
improve search