diff --git a/abuse-report.tpl.php b/abuse-report.tpl.php
index 16512cc..d600fa5 100644
--- a/abuse-report.tpl.php
+++ b/abuse-report.tpl.php
@@ -51,7 +51,7 @@
     </fieldset>
     <div class="details clear-block">
       <div class="column column-first">
-        <?php print $object->content['safe_value']; ?>
+        <?php print render($object->content); ?>
       </div>
       <div class="column column-last">
         <fieldset class="abuse-report-allow collapsible form-wrapper">
@@ -106,4 +106,4 @@
       <?php print render($moderate); ?>
     </div>
   </div>
-</fieldset>
\ No newline at end of file
+</fieldset>
diff --git a/abuse.module b/abuse.module
index 80cb5dc..3153fd3 100644
--- a/abuse.module
+++ b/abuse.module
@@ -1119,9 +1119,9 @@ function _abuse_get_assigned_count($status = FALSE) {
   ->condition('assigned_to_uid', $user->uid, '=')
   ->db_and()
   ->db_or()
-  ->condition('status', 'ABUSE_PENDING', '=')
+  ->condition('status', ABUSE_PENDING, '=')
   ->db_or()
-  ->condition('status', 'ABUSE_HIDDEN', '=')
+  ->condition('status', ABUSE_HIDDEN, '=')
   ->db_or()
   ->condition('status', 'ABUSE_SUPERADMIN', '=')
   ->orderBy('assigned_to_uid', 'DESC')