add filtered situation and detailed map -- though to be refactored