Rebuild query so chain is used only once
Bump to 0.0.85