Fixing #96 if map has only one CP & performance of widgets