1 files changed, 3 insertions, 3 deletions
diff --git a/main/src/cgeo/geocaching/WaypointPopup.java b/main/src/cgeo/geocaching/WaypointPopup.java
index 7fbfe10..eb0bc17 100644
--- a/main/src/cgeo/geocaching/WaypointPopup.java
+++ b/main/src/cgeo/geocaching/WaypointPopup.java
@@ -38,12 +38,12 @@ public class WaypointPopup extends AbstractPopupActivity {
     @Override
     protected void init() {
         super.init();
-        waypoint = app.loadWaypoint(waypointId);
+        waypoint = cgData.loadWaypoint(waypointId);
         try {
             if (StringUtils.isNotBlank(waypoint.getName())) {
                 setTitle(waypoint.getName());
             } else {
-                setTitle(waypoint.getGeocode().toUpperCase());
+                setTitle(waypoint.getGeocode());
             }
 
             // actionbar icon
@@ -53,7 +53,7 @@ public class WaypointPopup extends AbstractPopupActivity {
             details = new CacheDetailsCreator(this, (LinearLayout) findViewById(R.id.waypoint_details_list));
 
             //Waypoint geocode
-            details.add(R.string.cache_geocode, waypoint.getPrefix().toUpperCase() + waypoint.getGeocode().toUpperCase().substring(2));
+            details.add(R.string.cache_geocode, waypoint.getPrefix() + waypoint.getGeocode().substring(2));
 
             // Edit Button
             final Button buttonEdit = (Button) findViewById(R.id.edit);