Random filter fixes