Add todo for dated queries