Add back in filtering and ensure filters can be persistent via the URL