Corrections issues #1752, #1743 and factorisation of localised map/scale file search