admin filter fixes