Minor changes in Calendare read queries

Hi Keith,

This commit includes minor changes to Calendar read queries.

Regards
Ashok