diff --git a/sat/core/sat_main.py b/sat/core/sat_main.py
index b2f5e35d..3d0b9609 100644
--- a/sat/core/sat_main.py
+++ b/sat/core/sat_main.py
@@ -728,7 +728,7 @@ class SAT(service.Service):
                         resources = [None]
                     else:
                         try:
-                            resources = self.memory.getAllResources(client, jid_)
+                            resources = self.memory.getAvailableResources(client, jid_)
                         except exceptions.UnknownEntityError:
                             continue
                 for resource in resources:
diff --git a/sat/memory/memory.py b/sat/memory/memory.py
index f7138b9d..17199cbc 100644
--- a/sat/memory/memory.py
+++ b/sat/memory/memory.py
@@ -655,6 +655,7 @@ class Memory(object):
         @raise exceptions.UnknownEntityError: if entity is not in cache
         @raise ValueError: entity_jid has a resource
         """
+        # FIXME: is there a need to keep cache data for resources which are not connected anymore?
         if entity_jid.resource:
             raise ValueError("getAllResources must be used with a bare jid (got {})".format(entity_jid))
         profile_cache = self._getProfileCache(client)
diff --git a/sat_frontends/tools/xmlui.py b/sat_frontends/tools/xmlui.py
index ff41eda9..882f5b5b 100644
--- a/sat_frontends/tools/xmlui.py
+++ b/sat_frontends/tools/xmlui.py
@@ -266,7 +266,7 @@ class XMLUIBase(object):
 
     def _defaultCb(self, data, cb_id, profile):
         # TODO: when XMLUI updates will be managed, the _xmluiClose
-        #       must be called only if there is not update
+        #       must be called only if there is no update
         self._xmluiClose()
         self.host.actionManager(data, profile=profile)