fixed PMD violations in MapHandler