Make this work better
Add time filter and cleanup itentity filter