added calendar query support