fixed upcoming todo query