Change filters back to AND and fix bug with user summary filter