Some general fixes, jira issue moved to struct instead of using plain string  to create json