Updated filter logic for displaying warn/remove states. Filterbar future code commented out for clarity