Bugs:

1. Calendar presentation for queries didn't show attributes to display
2. Required fields were broken by the previous fix

Improvements