Some old changes I hadn't committed
Fix filtering in list view