Finishing Query touches