Backport hot fixes from PNR PACA

Error appeared in Geotrek 0.27, thus mapentity 1.8.3