implement missing fields, add module for calendar queries