请问这是强调句还是定语从句

我的理解是英语最重要的是语感,语法是后存在于语言的.
——where did you meet him?
——it was in the hotel （ ）he stayed last night.
如果填that,强调句的话,去掉it was 和that后 变成 he stayed in the hotel last night.就是说他昨天在hotel,强调他昨天在hotel.而原句是问你在哪遇到他,所以that不对.根据上下文,where did you meet him?你在哪遇到他?是在 hotel昨天他呆的那个.用where,上下文语义通顺.
第2个,It was the Athens 2004 olympic Games（ ）LIUxiang won a gold medal in the man’s race .个人感觉用when不好.,因为the Athens 2004 olympic Games指的不是时间,是雅典2004奥运会.the Athens 是雅典（地名）所以用where.