Final changes for Query Note