add rebind toggle
modify annotate
change test
Merge branch 'dev' of github.com:mdsb100/myquery into dev