changed start+end search strings to match new source layout