Changes around filtering and reports