Update for consistent table names
Update context for one calendar
Update for new version 1.8.1