Link on Clear Filters button should return the current view rather than the old draft view

[edkeeble]

Replaces #570 due to significant changes resulting in merge conflicts that I don't want to deal with.

Closes #550