diff --git a/www/base/src/app/common/filters/publicFields.filter.coffee b/www/base/src/app/common/filters/publicFields.filter.coffee
index 3e22572f20e..20c4ca7a3dd 100644
--- a/www/base/src/app/common/filters/publicFields.filter.coffee
+++ b/www/base/src/app/common/filters/publicFields.filter.coffee
@@ -1,7 +1,10 @@
 class PublicFields extends Filter('common')
     constructor: ->
         return (object) ->
-            copy = angular.copy(object)
-            for k of object
-                if k.indexOf('_') == 0 then delete copy[k]
-            return object
+            if not object?
+                return object
+            object._publicfields ?= {}
+            for k, v of object
+                if k.indexOf('_') != 0 and object.hasOwnProperty(k)
+                    object._publicfields[k] = v
+            return object._publicfields