Started work to override the query string widget from collections.

One test fails and I have no idea why :(