Fixed empty route lookups.
Fixed calendar import to handle both calendar and calendar_dates correctly.
EOF space