added focus filtering