removed search - not tested
more efficient string manip and no icon