Showing the building map should not depend  of a URI parameter

### Description

#### Which part should be improved? For better performance or maintainability?

#### Why is it important and for whom?

#### Which solutions have you thought about?
