One thing that has been mentioned in a similar kind, I'd like to stress: "Data" is just an additional layer that does not add any value, nor is it intuitive. Why not offer "Tracks" and "POI" (the own ones, not the new DBs) as separate buttons ?
If you prefer, then in addition to "Data".
TXs
Michael