Add some infos
fixes re-query bug
Merge commit '8d26bb1d1f27127abe8209fb1a5c3101d553ee19'