Minor changes in Calendare read queries