Small changes to name and timetable queries.  Added more comments about
EFA that have been discovered