cleaned up some admin overrides, made filter toggle-able