Added units to index, makes for primary display on results. Also changed dates to upcoming