fixed upcoming query