diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/handlers/DatabaseHandler.java b/app/src/main/java/de/apps4ics/mountainnavigation/handlers/DatabaseHandler.java
index c7ba5b1..4fedf43 100644
--- a/app/src/main/java/de/apps4ics/mountainnavigation/handlers/DatabaseHandler.java
+++ b/app/src/main/java/de/apps4ics/mountainnavigation/handlers/DatabaseHandler.java
@@ -370,13 +370,13 @@
     }
 
     private DbGeoPoint getGeoPointFromCursor(Cursor cursor){
-        long gp_id = cursor.getLong(0);
-        double lat = cursor.getDouble(1);
-        double lon = cursor.getDouble(2);
-        double alt = cursor.getDouble(3);
-        long time = cursor.getLong(4) * 1000;
-        long poiId = cursor.getLong(5);
-        int poiType = cursor.getInt(6);
+        long gp_id = cursor.getLong(cursor.getColumnIndex(KEY_GP_ID));
+        double lat = cursor.getDouble(cursor.getColumnIndex(KEY_POI_LAT));
+        double lon = cursor.getDouble(cursor.getColumnIndex(KEY_POI_LON));
+        double alt = cursor.getDouble(cursor.getColumnIndex(KEY_POI_ALT));
+        long time = cursor.getLong(cursor.getColumnIndex(KEY_POI_TIME)) * 1000;
+        long poiId = cursor.getLong(cursor.getColumnIndex(KEY_POI_EXT_ID));
+        int poiType = cursor.getInt(cursor.getColumnIndex(KEY_POI_TYPE));
         return new DbGeoPoint(gp_id, lat, lon, alt, time, poiId, poiType);
     }
 
@@ -396,8 +396,8 @@
     }
 
     private Fountain getFountainFromCursor(Cursor cursor){
-        long _id = cursor.getLong(0);
-        int size = cursor.getInt(1);
+        long _id = cursor.getLong(cursor.getColumnIndex(KEY_POI_ID));
+        int size = cursor.getInt(cursor.getColumnIndex(KEY_FOUNTAIN_SIZE));
         return new Fountain(_id, size);
     }
 
@@ -413,12 +413,12 @@
     }
 
     private Path getPathFromCursor(Cursor cursor){
-        long _id = cursor.getLong(0);
-        long _length = cursor.getLong(1);
-        int exposed = cursor.getInt(2);
-        int diff_wet = cursor.getInt(3);
-        int giddiness = cursor.getInt(4);
-        int climbing = cursor.getInt(5);
+        long _id = cursor.getLong(cursor.getColumnIndex(KEY_POI_ID));
+        long _length = cursor.getLong(cursor.getColumnIndex(KEY_PATH_LENGTH));
+        int exposed = cursor.getInt(cursor.getColumnIndex(KEY_PATH_EXPOSED));
+        int diff_wet = cursor.getInt(cursor.getColumnIndex(KEY_PATH_DIFF_WET));
+        int giddiness = cursor.getInt(cursor.getColumnIndex(KEY_PATH_GIDDINESS));
+        int climbing = cursor.getInt(cursor.getColumnIndex(KEY_PATH_CLIMBING));
         return new Path(_id, _length, exposed, diff_wet, giddiness, climbing);
     }
 
@@ -434,11 +434,11 @@
     }
 
     private BreakPoint getBreakpointFromCursor(Cursor cursor){
-        long _id = cursor.getLong(0);
-        int stone = cursor.getInt(1);
-        int bench = cursor.getInt(2);
-        int table = cursor.getInt(3);
-        int roofed = cursor.getInt(4);
+        long _id = cursor.getLong(cursor.getColumnIndex(KEY_POI_ID));
+        int stone = cursor.getInt(cursor.getColumnIndex(KEY_BREAK_POINT_STONE));
+        int bench = cursor.getInt(cursor.getColumnIndex(KEY_BREAK_POINT_BENCH));
+        int table = cursor.getInt(cursor.getColumnIndex(KEY_BREAK_POINT_TABLE));
+        int roofed = cursor.getInt(cursor.getColumnIndex(KEY_BREAK_POINT_ROOFED));
         return new BreakPoint(_id, stone, bench, table, roofed);
     }
 
@@ -454,7 +454,7 @@
     }
 
     private TrashBin getTrashbinFromCursor(Cursor cursor){
-        long _id = cursor.getLong(0);
+        long _id = cursor.getLong(cursor.getColumnIndex(KEY_POI_ID));
         return new TrashBin(_id);
     }
 
@@ -470,16 +470,16 @@
     }
 
     private Image getImageFromCursor(Cursor cursor){
-        long _id = cursor.getLong(0);
-        long poiId = cursor.getLong(1);
-        int poiType = cursor.getInt(2);
-        byte[] img = cursor.getBlob(3);
+        long _id = cursor.getLong(cursor.getColumnIndex(KEY_POI_ID));
+        long poiId = cursor.getLong(cursor.getColumnIndex(KEY_POI_EXT_ID));
+        int poiType = cursor.getInt(cursor.getColumnIndex(KEY_POI_TYPE));
+        byte[] img = cursor.getBlob(cursor.getColumnIndex(KEY_IMAGE_IMG));
         return new Image(_id, img, poiId, poiType);
     }
 
     private Image getImage(SQLiteDatabase db, long id){
         Cursor cursor = db.query(TABLE_IMAGE,
-                new String[]{KEY_POI_ID, KEY_GP_ID, KEY_IMAGE_IMG},
+                new String[]{KEY_POI_ID, KEY_POI_EXT_ID, KEY_POI_TYPE, KEY_IMAGE_IMG},
                 KEY_POI_ID + "=?",
                 new String[]{String.valueOf(id)}, null, null, null, null);
         if (cursor != null) {
@@ -489,12 +489,12 @@
     }
 
     private CellReception getCellReceptionFromCursor(Cursor cursor){
-        long _id = cursor.getLong(0);
-        int strength = cursor.getInt(1);
-        String opName = cursor.getString(2);
-        String opCountry = cursor.getString(3);
-        int roaming = cursor.getInt(4);
-        String nwType = cursor.getString(5);
+        long _id = cursor.getLong(cursor.getColumnIndex(KEY_POI_ID));
+        int strength = cursor.getInt(cursor.getColumnIndex(KEY_CELL_RECEPTION_STRENGTH));
+        String opName = cursor.getString(cursor.getColumnIndex(KEY_CELL_RECEPTION_OP_NAME));
+        String opCountry = cursor.getString(cursor.getColumnIndex(KEY_CELL_RECEPTION_OP_COUNTRY));
+        int roaming = cursor.getInt(cursor.getColumnIndex(KEY_CELL_RECEPTION_ROAMING));
+        String nwType = cursor.getString(cursor.getColumnIndex(KEY_CELL_RECEPTION_NW_TYPE));
         return new CellReception(_id, strength, opName, opCountry, roaming, nwType);
     }
 
@@ -510,9 +510,9 @@
     }
 
     private Wifi getWifiFromCursor(Cursor cursor){
-        long _id = cursor.getLong(0);
-        String ssid = cursor.getString(1);
-        int levels = cursor.getInt(2);
+        long _id = cursor.getLong(cursor.getColumnIndex(KEY_POI_ID));
+        String ssid = cursor.getString(cursor.getColumnIndex(KEY_WIFI_SSID));
+        int levels = cursor.getInt(cursor.getColumnIndex(KEY_WIFI_LEVELS));
         return new Wifi(_id, ssid, levels);
     }
 
@@ -528,8 +528,8 @@
     }
 
     private Lift getLiftFromCursor(Cursor cursor){
-        long _id = cursor.getLong(0);
-        String name = cursor.getString(3);
+        long _id = cursor.getLong(cursor.getColumnIndex(KEY_POI_ID));
+        String name = cursor.getString(cursor.getColumnIndex(KEY_LIFT_NAME));
         return new Lift(_id, name);
     }
 
@@ -545,8 +545,8 @@
     }
 
     private Peak getPeakFromCursor(Cursor cursor){
-        long _id = cursor.getLong(0);
-        String name = cursor.getString(1);
+        long _id = cursor.getLong(cursor.getColumnIndex(KEY_POI_ID));
+        String name = cursor.getString(cursor.getColumnIndex(KEY_PEAK_NAME));
         return new Peak(_id, name);
     }
 
@@ -562,10 +562,10 @@
     }
 
     private Hut getHutFromCursor(Cursor cursor){
-        long _id = cursor.getLong(0);
-        int hut_type = cursor.getInt(1);
-        int winterroom = cursor.getInt(2);
-        String name = cursor.getString(3);
+        long _id = cursor.getLong(cursor.getColumnIndex(KEY_POI_ID));
+        int hut_type = cursor.getInt(cursor.getColumnIndex(KEY_HUT_TYPE));
+        int winterroom = cursor.getInt(cursor.getColumnIndex(KEY_HUT_WINTER_ROOM));
+        String name = cursor.getString(cursor.getColumnIndex(KEY_HUT_NAME));
         return new Hut(_id, hut_type, winterroom, name);
     }