Token sorting, display

Other updates also for filtering "bad" place references (no lat/lon)
from display results.