diff --git a/device/templates/details.html b/device/templates/details.html
index 3669679..34f9edd 100644
--- a/device/templates/details.html
+++ b/device/templates/details.html
@@ -126,7 +126,7 @@
           </tr>
         </thead>
         <tbody>
-          {% for a in object.get_user_annotations %}
+          {% for a in object.get_user_properties %}
             <tr>
               <td>{{ a.key }}</td>
               <td>{{ a.value }}</td>
diff --git a/device/views.py b/device/views.py
index 45ff289..80c2e46 100644
--- a/device/views.py
+++ b/device/views.py
@@ -12,7 +12,7 @@ from django.views.generic.edit import (
 )
 from django.views.generic.base import TemplateView
 from dashboard.mixins import DashboardView, Http403
-from evidence.models import UserProperty, SystemProperty
+from evidence.models import UserProperty, SystemProperty, Property
 from lot.models import LotTag
 from device.models import Device
 from device.forms import DeviceFormSet