VE-1321: Use [Select|Option]Widget in MapDialog + proper insertion