Which comparison correctly distinguishes fawat and ihsar?

Bab al-Fawat — Missing Hajj, Release, Makeup Hajj and Umrah

• Fawat is expiry of standing time; ihsar is an actual obstruction
• Both mean staying in Makkah
• Fawat occurs only in Umrah
• Ihsar involves no obstacle