fix calendar issues, add support for survey extension table