Refactor charts and add jira filter