Minor code refactoring, disbaled map click in POI, closes #86