improved find replace data