show more fields; clean up index