Add focus filtering and group computation