Move URL query string handling into an HOC

This will work better if there are other query string options that need to be handled later. It also handles the distinction between ‘all’ and the other tutorials better.