Fill up your BEV with gas...NOT!

So I took delivery of my 2017 i3 BEV and strangely the navigation menu Points of Interest shows Fuel stations rather than Charging stations! Yes, if you dig down into the lower level menus under Car there is an option for Charging stations. My 2014 i3 showed me the Charging stations menu and never a Fuel station.

Did they program it incorrectly or is this a change for MY 2017?

Also, my problem with the phone app (iOS) not showing charge continues with the new car. Since Oct 2016 neither of my i3s have shown charge state, though I can preheat and lock.

Car back from the dealer. Has latest software. Now I'm seeing Charging Stations under POI, but Fuel Stations remains. Doesn't appear that it can be deleted.