CATSX-84 Made many changes to filter page per jira issue