diff --git a/src/module_vmap/module/forms/vmap_business_object/vmap_business_object_vmap_business_object.js b/src/module_vmap/module/forms/vmap_business_object/vmap_business_object_vmap_business_object.js
index ad663b75ea42b64cae3ef34ae7ed92a5700ea8f9..80ce27242794ab26e6305251870eb4adbaa0c17b 100644
--- a/src/module_vmap/module/forms/vmap_business_object/vmap_business_object_vmap_business_object.js
+++ b/src/module_vmap/module/forms/vmap_business_object/vmap_business_object_vmap_business_object.js
@@ -250,6 +250,21 @@ var oFormScope;
                         oFormValues['id_field']['options'] = aColumnsOptions;
                     }
                 }
+                if (angular.isDefined(oFormValues['geom_column'])) {
+                    if (angular.isDefined(oFormValues['geom_column']['options'])) {
+                        oFormValues['geom_column']['options'] = aColumnsOptions;
+                    }
+                }
+                if (angular.isDefined(oFormValues['search_field'])) {
+                    if (angular.isDefined(oFormValues['search_field']['options'])) {
+                        oFormValues['search_field']['options'] = aColumnsOptions;
+                    }
+                }
+                if (angular.isDefined(oFormValues['result_field'])) {
+                    if (angular.isDefined(oFormValues['result_field']['options'])) {
+                        oFormValues['result_field']['options'] = aColumnsOptions;
+                    }
+                }
             });
 
         },
diff --git a/src/module_vmap/module/forms/vmap_business_object/vmap_business_object_vmap_business_object.json b/src/module_vmap/module/forms/vmap_business_object/vmap_business_object_vmap_business_object.json
index b5697404c934a44fa2069f9ed2ce3be2fec2b480..17dbe0468ee4c3609c0710e359ad976f627aea44 100644
--- a/src/module_vmap/module/forms/vmap_business_object/vmap_business_object_vmap_business_object.json
+++ b/src/module_vmap/module/forms/vmap_business_object/vmap_business_object_vmap_business_object.json
@@ -291,41 +291,76 @@
             },
             {
                 "fields": [{
-                        "type": "text",
+                        "type": "editable_select",
                         "name": "geom_column",
                         "label": "FORM_GEOM_COLUMN_DEVELOPMENT_0",
                         "required": true,
-                        "pattern": "",
-                        "nb_cols": 6,
-                        "id": "New_el_10_12_1"
+                        "nb_cols": 5
+                    }, {
+                        "type": "button",
+                        "class": "btn-group btn-group-sm margin-top-20",
+                        "nb_cols": 1,
+                        "buttons": [{
+                                "type": "button",
+                                "name": "table-datalist",
+                                "label": "FORM_GEOM_COLUMN_DEVELOPMENT_0",
+                                "class": "btn-primary",
+                                "event": "loadVMapBoFormColumns()",
+                                "glyphicon": "refresh"
+                            }
+                        ]
                     }]
             },
             {
                 "fields": [{
-                        "type": "text",
+                        "type": "editable_select",
                         "name": "search_field",
                         "label": "FORM_SEARCH_FIELD_0",
-                        "nb_cols": 6,
-                        "id": "New_el_11_13_1",
+                        "nb_cols": 5,
                         "tooltip": {
                             "title": "",
                             "content": "FORM_SEARCH_FIELD_0_TOOLTIP",
                             "container": "body"
                         }
+                    }, {
+                        "type": "button",
+                        "class": "btn-group btn-group-sm margin-top-20",
+                        "nb_cols": 1,
+                        "buttons": [{
+                                "type": "button",
+                                "name": "table-datalist",
+                                "label": "FORM_SEARCH_FIELD_0",
+                                "class": "btn-primary",
+                                "event": "loadVMapBoFormColumns()",
+                                "glyphicon": "refresh"
+                            }
+                        ]
                     }]
             },
             {
                 "fields": [{
-                        "type": "text",
+                        "type": "editable_select",
                         "name": "result_field",
                         "label": "FORM_RESULT_FIELD_0",
-                        "nb_cols": 6,
-                        "id": "New_el_12_14_1",
+                        "nb_cols": 5,
                         "tooltip": {
                             "title": "",
                             "content": "FORM_RESULT_FIELD_0_TOOLTIP",
                             "container": "body"
                         }
+                    }, {
+                        "type": "button",
+                        "class": "btn-group btn-group-sm margin-top-20",
+                        "nb_cols": 1,
+                        "buttons": [{
+                                "type": "button",
+                                "name": "table-datalist",
+                                "label": "FORM_RESULT_FIELD_0",
+                                "class": "btn-primary",
+                                "event": "loadVMapBoFormColumns()",
+                                "glyphicon": "refresh"
+                            }
+                        ]
                     }]
             },
             {
@@ -685,41 +720,76 @@
             },
             {
                 "fields": [{
-                        "type": "text",
+                        "type": "editable_select",
                         "name": "geom_column",
                         "label": "FORM_GEOM_COLUMN_DEVELOPMENT_0",
                         "required": true,
-                        "pattern": "",
-                        "nb_cols": 6,
-                        "id": "New_el_10_12_1"
+                        "nb_cols": 5
+                    }, {
+                        "type": "button",
+                        "class": "btn-group btn-group-sm margin-top-20",
+                        "nb_cols": 1,
+                        "buttons": [{
+                                "type": "button",
+                                "name": "table-datalist",
+                                "label": "FORM_GEOM_COLUMN_DEVELOPMENT_0",
+                                "class": "btn-primary",
+                                "event": "loadVMapBoFormColumns()",
+                                "glyphicon": "refresh"
+                            }
+                        ]
                     }]
             },
             {
                 "fields": [{
-                        "type": "text",
+                        "type": "editable_select",
                         "name": "search_field",
                         "label": "FORM_SEARCH_FIELD_0",
-                        "nb_cols": 6,
-                        "id": "New_el_11_13_1",
+                        "nb_cols": 5,
                         "tooltip": {
                             "title": "",
                             "content": "FORM_SEARCH_FIELD_0_TOOLTIP",
                             "container": "body"
                         }
+                    }, {
+                        "type": "button",
+                        "class": "btn-group btn-group-sm margin-top-20",
+                        "nb_cols": 1,
+                        "buttons": [{
+                                "type": "button",
+                                "name": "table-datalist",
+                                "label": "FORM_SEARCH_FIELD_0",
+                                "class": "btn-primary",
+                                "event": "loadVMapBoFormColumns()",
+                                "glyphicon": "refresh"
+                            }
+                        ]
                     }]
             },
             {
                 "fields": [{
-                        "type": "text",
+                        "type": "editable_select",
                         "name": "result_field",
                         "label": "FORM_RESULT_FIELD_0",
-                        "nb_cols": 6,
-                        "id": "New_el_12_14_1",
+                        "nb_cols": 5,
                         "tooltip": {
                             "title": "",
                             "content": "FORM_RESULT_FIELD_0_TOOLTIP",
                             "container": "body"
                         }
+                    }, {
+                        "type": "button",
+                        "class": "btn-group btn-group-sm margin-top-20",
+                        "nb_cols": 1,
+                        "buttons": [{
+                                "type": "button",
+                                "name": "table-datalist",
+                                "label": "FORM_RESULT_FIELD_0",
+                                "class": "btn-primary",
+                                "event": "loadVMapBoFormColumns()",
+                                "glyphicon": "refresh"
+                            }
+                        ]
                     }]
             },
             {