fix some warnings and remove dead code
use SearchStringParser to improve search