Usage data filter fixes