fixes duplications and related problems (jira issue 67)