Admin: improved filter and view