add todo notes for expanding Query