gras: query changes from thread query branch