A few changes - remove unwanted labels - fix empty poi list entries

Hi Bernd,
here my changes as I promised.
Ciao,
  Franco