RM: updates to calendar selector