fronted updates - search for stop + tidy up