bug fixes mcda  integration refactor