I encountered similar issues the first couple play throughs. I think there are just some assumptions in the question progression about what info you'll have at what point, and since there are so many ways into the old city, it's easy for the narrative to get a little ... flexible.
I just try to play that part pretty straight, don't go down there until asked to, and so on, just to keep the continuity.