Cleanup views
Add filter by email