Updated filter logic and styles.