Filters now show URIs
More work on restoring state, but not working yet :(