Slight optimization to calendar retrieval