Fixed missed location counting problems

->  next: improve display
fixed counting and display