Tell es-safi and Gath should probably be merged since Es Safi is simply the Arab period name for the Philistine city of Gath.