fixing clang query problems