fixed EH filtering logic in dashboard view to remove duplicated code