Simplify admin filtering, add export back in