diff --git a/CHANGES.rst b/CHANGES.rst
index 0c7b4e6eb6..d098127502 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -19,6 +19,7 @@ Changelog
 
 **Fixed**
 
+- #1477 Sample edit form - some selection widgets empty
 - #1478 Clients default CC E-Mails missing in Add Sample
 - #1479 Fixed too many redirects error: Labclerks viewing verified worksheets
 - #1480 Worksheet removal results in 404
diff --git a/bika/lims/adapters/configure.zcml b/bika/lims/adapters/configure.zcml
index b726525fd0..d5a491fca1 100644
--- a/bika/lims/adapters/configure.zcml
+++ b/bika/lims/adapters/configure.zcml
@@ -12,14 +12,24 @@
       provides="bika.lims.interfaces.IReferenceWidgetVocabulary"
     />
 
-    <!-- Display the Batches that belong to same client or not assigned to any
-    client in Analysis Request view -->
+    <!-- ClientAwareReferenceWidgetVocabulary
+    Injects getClientUID or getParentUID as additional search criteria for
+    client-bound reference fields -->
+    <adapter
+      for="bika.lims.interfaces.IBatch
+           zope.publisher.interfaces.browser.IBrowserRequest"
+      factory=".referencewidgetvocabulary.ClientAwareReferenceWidgetVocabulary"
+      provides="bika.lims.interfaces.IReferenceWidgetVocabulary" />
+    <adapter
+      for="bika.lims.interfaces.IClient
+           zope.publisher.interfaces.browser.IBrowserRequest"
+      factory=".referencewidgetvocabulary.ClientAwareReferenceWidgetVocabulary"
+      provides="bika.lims.interfaces.IReferenceWidgetVocabulary" />
     <adapter
       for="bika.lims.interfaces.IAnalysisRequest
            zope.publisher.interfaces.browser.IBrowserRequest"
-      factory="bika.lims.adapters.referencewidgetvocabulary.BatchReferenceWidgetVocabulary"
-      provides="bika.lims.interfaces.IReferenceWidgetVocabulary"
-    />
+      factory=".referencewidgetvocabulary.ClientAwareReferenceWidgetVocabulary"
+      provides="bika.lims.interfaces.IReferenceWidgetVocabulary" />
 
 
     <!--
diff --git a/bika/lims/adapters/referencewidgetvocabulary.py b/bika/lims/adapters/referencewidgetvocabulary.py
index 33dacf090f..1fd99cc2d3 100644
--- a/bika/lims/adapters/referencewidgetvocabulary.py
+++ b/bika/lims/adapters/referencewidgetvocabulary.py
@@ -19,13 +19,16 @@
 # Some rights reserved, see README and LICENSE.
 
 import json
+import six
+
+from zope.interface import implements
 
 from bika.lims import api
 from bika.lims import logger
-from bika.lims.interfaces import IReferenceWidgetVocabulary, IAnalysisRequest
+from bika.lims.interfaces import IReferenceWidgetVocabulary
+from bika.lims.utils import get_client
 from bika.lims.utils import to_unicode as _u
 from bika.lims.utils import to_utf8 as _c
-from zope.interface import implements
 
 
 class DefaultReferenceWidgetVocabulary(object):
@@ -259,16 +262,56 @@ def __call__(self):
         return brains
 
 
-class BatchReferenceWidgetVocabulary(DefaultReferenceWidgetVocabulary):
+class ClientAwareReferenceWidgetVocabulary(DefaultReferenceWidgetVocabulary):
+    """Injects search criteria (filters) in the query when the current context
+    is, belongs or is associated to a Client
+    """
+
+    # portal_types that might be bound to a client
+    client_bound_types = [
+        "Contact",
+        "Batch",
+        "AnalysisProfile",
+        "AnalysisSpec",
+        "ARTemplate",
+        "SamplePoint"
+    ]
 
     def get_raw_query(self):
         """Returns the raw query to use for current search, based on the
         base query + update query
         """
-        query = super(BatchReferenceWidgetVocabulary, self).get_raw_query()
-        if IAnalysisRequest.providedBy(self.context):
-            # Display the Batches from the Client the Sample belongs to and
-            # those that do not belong to any Client
-            client = self.context.getClient()
-            query["getClientUID"] = [api.get_uid(client), ""]
+        query = super(
+            ClientAwareReferenceWidgetVocabulary, self).get_raw_query()
+
+        if self.is_client_aware(query):
+
+            client = get_client(self.context)
+            client_uid = client and api.get_uid(client) or None
+
+            if client_uid:
+                # Apply the search criteria for this client
+                # Contact is the only object bound to a Client that is stored
+                # in portal_catalog. And in this catalog, getClientUID does not
+                # exist, rather getParentUID
+                if "Contact" in self.get_portal_types(query):
+                    query["getParentUID"] = [client_uid]
+                else:
+                    query["getClientUID"] = [client_uid, ""]
+
         return query
+
+    def is_client_aware(self, query):
+        """Returns whether the query passed in requires a filter by client
+        """
+        portal_types = self.get_portal_types(query)
+        intersect = set(portal_types).intersection(self.client_bound_types)
+        return len(intersect) > 0
+
+    def get_portal_types(self, query):
+        """Return the list of portal types from the query passed-in
+        """
+        portal_types = query.get("portal_type", [])
+        if isinstance(portal_types, six.string_types):
+            portal_types = [portal_types]
+        return portal_types
diff --git a/bika/lims/browser/analysisrequest/add2.py b/bika/lims/browser/analysisrequest/add2.py
index 0209ad24dc..6583db79f9 100644
--- a/bika/lims/browser/analysisrequest/add2.py
+++ b/bika/lims/browser/analysisrequest/add2.py
@@ -45,8 +45,9 @@
 from bika.lims import logger
 from bika.lims.api.analysisservice import get_calculation_dependencies_for
 from bika.lims.api.analysisservice import get_service_dependencies_for
-from bika.lims.interfaces import IGetDefaultFieldValueARAddHook, \
-    IAddSampleFieldsFlush, IAddSampleObjectInfo
+from bika.lims.interfaces import IAddSampleFieldsFlush
+from bika.lims.interfaces import IAddSampleObjectInfo
+from bika.lims.interfaces import IGetDefaultFieldValueARAddHook
 from bika.lims.utils import tmpID
 from bika.lims.utils.analysisrequest import create_analysisrequest as crar
 from bika.lims.workflow import ActionHandlerPool
@@ -831,25 +832,6 @@ def get_client_info(self, obj):
         # UID of the client
         uid = api.get_uid(obj)
 
-        # Bika Setup folder
-        bika_setup = api.get_bika_setup()
-
-        # bika samplepoints
-        bika_samplepoints = bika_setup.bika_samplepoints
-        bika_samplepoints_uid = api.get_uid(bika_samplepoints)
-
-        # bika artemplates
-        bika_artemplates = bika_setup.bika_artemplates
-        bika_artemplates_uid = api.get_uid(bika_artemplates)
-
-        # bika analysisprofiles
-        bika_analysisprofiles = bika_setup.bika_analysisprofiles
-        bika_analysisprofiles_uid = api.get_uid(bika_analysisprofiles)
-
-        # bika analysisspecs
-        bika_analysisspecs = bika_setup.bika_analysisspecs
-        bika_analysisspecs_uid = api.get_uid(bika_analysisspecs)
-
         # catalog queries for UI field filtering
         filter_queries = {
             "Contact": {
@@ -862,16 +844,16 @@ def get_client_info(self, obj):
                 "getParentUID": [uid]
             },
             "SamplePoint": {
-                "getClientUID": [uid, bika_samplepoints_uid],
+                "getClientUID": [uid, ""],
             },
             "Template": {
-                "getClientUID": [uid, bika_artemplates_uid],
+                "getClientUID": [uid, ""],
             },
             "Profiles": {
-                "getClientUID": [uid, bika_analysisprofiles_uid],
+                "getClientUID": [uid, ""],
             },
             "Specification": {
-                "getClientUID": [uid, bika_analysisspecs_uid],
+                "getClientUID": [uid, ""],
             },
             "SamplingRound": {
                 "getParentUID": [uid],
@@ -1019,17 +1001,6 @@ def get_sampletype_info(self, obj):
         """
         info = self.get_base_info(obj)
 
-        # Bika Setup folder
-        bika_setup = api.get_bika_setup()
-
-        # bika samplepoints
-        bika_samplepoints = bika_setup.bika_samplepoints
-        bika_samplepoints_uid = api.get_uid(bika_samplepoints)
-
-        # bika analysisspecs
-        bika_analysisspecs = bika_setup.bika_analysisspecs
-        bika_analysisspecs_uid = api.get_uid(bika_analysisspecs)
-
         # client
         client = self.get_client()
         client_uid = client and api.get_uid(client) or ""
@@ -1045,12 +1016,12 @@ def get_sampletype_info(self, obj):
         filter_queries = {
             "SamplePoint": {
                 "getSampleTypeTitles": [obj.Title(), ''],
-                "getClientUID": [client_uid, bika_samplepoints_uid],
+                "getClientUID": [client_uid, ""],
                 "sort_order": "descending",
             },
             "Specification": {
                 "getSampleTypeTitle": obj.Title(),
-                "getClientUID": [client_uid, bika_analysisspecs_uid],
+                "getClientUID": [client_uid, ""],
                 "sort_order": "descending",
             }
         }
diff --git a/bika/lims/browser/client/__init__.py b/bika/lims/browser/client/__init__.py
index 6cb2cc628b..e44f0293ec 100644
--- a/bika/lims/browser/client/__init__.py
+++ b/bika/lims/browser/client/__init__.py
@@ -30,6 +30,3 @@
 from views.contacts import ClientContactsView
 from views.contacts import ClientContactVocabularyFactory
 from views.samplingrounds import ClientSamplingRoundsView
-
-from ajax import ReferenceWidgetVocabulary
-from ajax import ajaxGetClientInfo
diff --git a/bika/lims/browser/client/ajax.py b/bika/lims/browser/client/ajax.py
deleted file mode 100644
index 082daa6f71..0000000000
--- a/bika/lims/browser/client/ajax.py
+++ /dev/null
@@ -1,64 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# This file is part of SENAITE.CORE.
-#
-# SENAITE.CORE is free software: you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation, version 2.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
-# details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Software Foundation, Inc., 51
-# Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Copyright 2018-2019 by it's authors.
-# Some rights reserved, see README and LICENSE.
-
-import json
-
-import plone
-from bika.lims import api
-from bika.lims.adapters.referencewidgetvocabulary import \
-    DefaultReferenceWidgetVocabulary
-from bika.lims.browser import BrowserView
-from Products.CMFCore.utils import getToolByName
-
-
-class ReferenceWidgetVocabulary(DefaultReferenceWidgetVocabulary):
-    """Implements IReferenceWidgetVocabulary for Clients
-    """
-
-    def __call__(self):
-        base_query = json.loads(self.request['base_query'])
-        portal_type = base_query.get('portal_type', [])
-        if 'Contact' in portal_type:
-            base_query['getParentUID'] = [self.context.UID(), ]
-            # If ensure_ascii is false, a result may be a unicode instance. This
-            # usually happens if the input contains unicode strings or the encoding
-            # parameter is used.
-            # see: https://github.com/senaite/senaite.core/issues/605
-            self.request['base_query'] = json.dumps(base_query, ensure_ascii=False)
-        return DefaultReferenceWidgetVocabulary.__call__(self)
-
-
-class ajaxGetClientInfo(BrowserView):
-    """Public exposed getClientInfo to be used by the JSON API
-    """
-
-    def __call__(self):
-        plone.protect.CheckAuthenticator(self.request)
-        wf = getToolByName(self.context, 'portal_workflow')
-        ret = {'ClientTitle': self.context.Title(),
-               'ClientID': self.context.getClientID(),
-               'ClientSysID': self.context.id,
-               'ClientUID': self.context.UID(),
-               'ContactUIDs': [c.UID() for c in
-                               self.context.objectValues('Contact') if
-                               api.is_active(c)]
-               }
-
-        return json.dumps(ret)
diff --git a/bika/lims/browser/client/configure.zcml b/bika/lims/browser/client/configure.zcml
index be5fc70211..3edad7d5d4 100644
--- a/bika/lims/browser/client/configure.zcml
+++ b/bika/lims/browser/client/configure.zcml
@@ -11,13 +11,6 @@
       name="getContacts"
     />
 
-    <adapter
-      for="bika.lims.interfaces.IClient
-           zope.publisher.interfaces.browser.IBrowserRequest"
-      factory="bika.lims.browser.client.ReferenceWidgetVocabulary"
-      provides="bika.lims.interfaces.IReferenceWidgetVocabulary"
-    />
-
     <browser:page
       for="bika.lims.interfaces.IClient"
       name="batches"
@@ -98,14 +91,6 @@
       layer="bika.lims.interfaces.IBikaLIMS"
     />
 
-    <browser:page
-      for="bika.lims.interfaces.IClient"
-      name="getClientInfo"
-      class="bika.lims.browser.client.ajaxGetClientInfo"
-      permission="zope.Public"
-      layer="bika.lims.interfaces.IBikaLIMS"
-    />
-
     <browser:page
       for="bika.lims.interfaces.IClient"
       name="sampling_rounds_view"
diff --git a/bika/lims/browser/js/bika.lims.analysisrequest.js b/bika/lims/browser/js/bika.lims.analysisrequest.js
index 8f317effa7..bdc8a50d8f 100644
--- a/bika/lims/browser/js/bika.lims.analysisrequest.js
+++ b/bika/lims/browser/js/bika.lims.analysisrequest.js
@@ -114,7 +114,7 @@
    */
 
   window.AnalysisRequestViewView = function() {
-    var filter_CCContacts, filter_by_client, getClientUID, parse_CCClist, resultsinterpretation_move_below, that;
+    var parse_CCClist, resultsinterpretation_move_below, that;
     that = this;
 
     /**
@@ -138,56 +138,6 @@
         $('table.mceToolbar a.mce_save').hide();
       }), 1500);
     };
-    filter_CCContacts = function() {
-
-      /**
-       * Filter the CCContacts dropdown list by the current client.
-       */
-      var clientUID, element;
-      if ($('#CCContact').length > 0) {
-        element = $('#CCContact');
-        clientUID = getClientUID();
-        filter_by_client(element, 'getParentUID', clientUID);
-      }
-    };
-    getClientUID = function() {
-
-      /**
-       * Return the AR client's UID.
-       */
-      var clientid, clientuid;
-      clientid = window.location.href.split('clients')[1].split('/')[1];
-      clientuid = '';
-      $.ajax({
-        url: window.portal_url + '/clients/' + clientid + '/getClientInfo',
-        type: 'POST',
-        async: false,
-        data: {
-          '_authenticator': $('input[name="_authenticator"]').val()
-        },
-        dataType: 'json',
-        success: function(data, textStatus, $XHR) {
-          if (data['ClientUID'] !== '') {
-            clientuid = data['ClientUID'] !== '' ? data['ClientUID'] : null;
-          }
-        }
-      });
-      return clientuid;
-    };
-    filter_by_client = function(element, filterkey, filtervalue) {
-
-      /**
-       * Filter the dropdown's results (called element) by current client contacts.
-       */
-      var base_query, options;
-      base_query = $.parseJSON($(element).attr('base_query'));
-      base_query[filterkey] = filtervalue;
-      $(element).attr('base_query', $.toJSON(base_query));
-      options = $.parseJSON($(element).attr('combogrid_options'));
-      $(element).attr('base_query', $.toJSON(base_query));
-      $(element).attr('combogrid_options', $.toJSON(options));
-      referencewidget_lookups($(element));
-    };
     parse_CCClist = function() {
 
       /**
@@ -206,46 +156,7 @@
       return fieldvalue;
     };
     that.load = function() {
-      var cid;
       resultsinterpretation_move_below();
-      filter_CCContacts();
-      if (document.location.href.search('/clients/') >= 0 && $('#archetypes-fieldname-SamplePoint #SamplePoint').length > 0) {
-        cid = document.location.href.split('clients')[1].split('/')[1];
-        $.ajax({
-          url: window.portal_url + '/clients/' + cid + '/getClientInfo',
-          type: 'POST',
-          data: {
-            '_authenticator': $('input[name="_authenticator"]').val()
-          },
-          dataType: 'json',
-          success: function(data, textStatus, $XHR) {
-            var base_query, options, setup_uid, simple_url, spelement;
-            if (data['ClientUID'] !== '') {
-              spelement = $('#archetypes-fieldname-SamplePoint #SamplePoint');
-              base_query = $.parseJSON($(spelement).attr('base_query'));
-              setup_uid = $('#bika_setup').attr('bika_samplepoints');
-              base_query['getClientUID'] = [data['ClientUID'], setup_uid];
-              $(spelement).attr('base_query', $.toJSON(base_query));
-              options = $.parseJSON($(spelement).attr('combogrid_options'));
-              simple_url = window.location.href.split('/ar')[0];
-              simple_url = simple_url.split('?')[0];
-              options.url = simple_url + '/' + options.url;
-              options.url = options.url + '?_authenticator=' + $('input[name=\'_authenticator\']').val();
-              options.url = options.url + '&catalog_name=' + $(spelement).attr('catalog_name');
-              options.url = options.url + '&base_query=' + $.toJSON(base_query);
-              options.url = options.url + '&search_query=' + $(spelement).attr('search_query');
-              options.url = options.url + '&colModel=' + $.toJSON($.parseJSON($(spelement).attr('combogrid_options')).colModel);
-              options.url = options.url + '&search_fields=' + $.toJSON($.parseJSON($(spelement).attr('combogrid_options')).search_fields);
-              options.url = options.url + '&discard_empty=' + $.toJSON($.parseJSON($(spelement).attr('combogrid_options')).discard_empty);
-              options.url = options.url + '&minLength=' + $.toJSON($.parseJSON($(spelement).attr('combogrid_options')).minLength);
-              options.force_all = 'false';
-              $(spelement).combogrid(options);
-              $(spelement).addClass('has_combogrid_widget');
-              $(spelement).attr('search_query', '{}');
-            }
-          }
-        });
-      }
     };
   };
 
diff --git a/bika/lims/browser/js/coffee/bika.lims.analysisrequest.coffee b/bika/lims/browser/js/coffee/bika.lims.analysisrequest.coffee
index 24f85d4209..b065529f04 100644
--- a/bika/lims/browser/js/coffee/bika.lims.analysisrequest.coffee
+++ b/bika/lims/browser/js/coffee/bika.lims.analysisrequest.coffee
@@ -126,56 +126,6 @@ window.AnalysisRequestViewView = ->
     ), 1500
     return
 
-  filter_CCContacts = ->
-
-    ###*
-    # Filter the CCContacts dropdown list by the current client.
-    ###
-
-    if $('#CCContact').length > 0
-      element = $('#CCContact')
-      clientUID = getClientUID()
-      filter_by_client element, 'getParentUID', clientUID
-    return
-
-  getClientUID = ->
-
-    ###*
-    # Return the AR client's UID.
-    ###
-
-    clientid = window.location.href.split('clients')[1].split('/')[1]
-    # ajax petition to obtain the current client info
-    clientuid = ''
-    $.ajax
-      url: window.portal_url + '/clients/' + clientid + '/getClientInfo'
-      type: 'POST'
-      async: false
-      data: '_authenticator': $('input[name="_authenticator"]').val()
-      dataType: 'json'
-      success: (data, textStatus, $XHR) ->
-        if data['ClientUID'] != ''
-          clientuid = if data['ClientUID'] != '' then data['ClientUID'] else null
-        return
-    clientuid
-
-  filter_by_client = (element, filterkey, filtervalue) ->
-
-    ###*
-    # Filter the dropdown's results (called element) by current client contacts.
-    ###
-
-    # Get the base_query data in array format
-    base_query = $.parseJSON($(element).attr('base_query'))
-    base_query[filterkey] = filtervalue
-    $(element).attr 'base_query', $.toJSON(base_query)
-    options = $.parseJSON($(element).attr('combogrid_options'))
-    $(element).attr 'base_query', $.toJSON(base_query)
-    $(element).attr 'combogrid_options', $.toJSON(options)
-    referencewidget_lookups $(element)
-    return
-
-
   parse_CCClist = ->
 
     ###*
@@ -194,50 +144,6 @@ window.AnalysisRequestViewView = ->
 
   that.load = ->
     resultsinterpretation_move_below()
-    filter_CCContacts()
-
-    if document.location.href.search('/clients/') >= 0 and $('#archetypes-fieldname-SamplePoint #SamplePoint').length > 0
-      cid = document.location.href.split('clients')[1].split('/')[1]
-      $.ajax
-        url: window.portal_url + '/clients/' + cid + '/getClientInfo'
-        type: 'POST'
-        data: '_authenticator': $('input[name="_authenticator"]').val()
-        dataType: 'json'
-        success: (data, textStatus, $XHR) ->
-          if data['ClientUID'] != ''
-            spelement = $('#archetypes-fieldname-SamplePoint #SamplePoint')
-            base_query = $.parseJSON($(spelement).attr('base_query'))
-            setup_uid = $('#bika_setup').attr('bika_samplepoints')
-            base_query['getClientUID'] = [
-              data['ClientUID']
-              setup_uid
-            ]
-            $(spelement).attr 'base_query', $.toJSON(base_query)
-            options = $.parseJSON($(spelement).attr('combogrid_options'))
-            # Getting the url like that will return the query
-            # part of it:
-            # http://localhost:8080/Plone/clients/client17-14/..
-            #    ..OA17-0030-R01
-            # In order to create a correct ajax call
-            # we only need until the pathname of that url:
-            # http://localhost:8080/Plone/clients/client17-14/..
-            #    ..OA17-0030-R01
-            simple_url = window.location.href.split('/ar')[0]
-            simple_url = simple_url.split('?')[0]
-            options.url = simple_url + '/' + options.url
-            options.url = options.url + '?_authenticator=' + $('input[name=\'_authenticator\']').val()
-            options.url = options.url + '&catalog_name=' + $(spelement).attr('catalog_name')
-            options.url = options.url + '&base_query=' + $.toJSON(base_query)
-            options.url = options.url + '&search_query=' + $(spelement).attr('search_query')
-            options.url = options.url + '&colModel=' + $.toJSON($.parseJSON($(spelement).attr('combogrid_options')).colModel)
-            options.url = options.url + '&search_fields=' + $.toJSON($.parseJSON($(spelement).attr('combogrid_options')).search_fields)
-            options.url = options.url + '&discard_empty=' + $.toJSON($.parseJSON($(spelement).attr('combogrid_options')).discard_empty)
-            options.url = options.url + '&minLength=' + $.toJSON($.parseJSON($(spelement).attr('combogrid_options')).minLength)
-            options.force_all = 'false'
-            $(spelement).combogrid options
-            $(spelement).addClass 'has_combogrid_widget'
-            $(spelement).attr 'search_query', '{}'
-          return
     return
 
   return
diff --git a/bika/lims/content/abstractroutineanalysis.py b/bika/lims/content/abstractroutineanalysis.py
index dc21d0c8e0..8e160b40d7 100644
--- a/bika/lims/content/abstractroutineanalysis.py
+++ b/bika/lims/content/abstractroutineanalysis.py
@@ -29,6 +29,7 @@
 from bika.lims.content.abstractanalysis import AbstractAnalysis
 from bika.lims.content.abstractanalysis import schema
 from bika.lims.content.analysisspec import ResultsRangeDict
+from bika.lims.content.clientawaremixin import ClientAwareMixin
 from bika.lims.content.reflexrule import doReflexRuleAction
 from bika.lims.interfaces import IAnalysis
 from bika.lims.interfaces import ICancellable
@@ -124,7 +125,7 @@
 ))
 
 
-class AbstractRoutineAnalysis(AbstractAnalysis):
+class AbstractRoutineAnalysis(AbstractAnalysis, ClientAwareMixin):
     implements(IAnalysis, IRequestAnalysis, IRoutineAnalysis, ICancellable)
     security = ClassSecurityInfo()
     displayContentsTab = False
@@ -166,38 +167,11 @@ def getRequestURL(self):
         if request:
             return request.absolute_url_path()
 
-    @security.public
-    def getClientTitle(self):
-        """Used to populate catalog values.
-        Returns the Title of the client for this analysis' AR.
-        """
-        request = self.getRequest()
-        if request:
-            client = request.getClient()
-            if client:
-                return client.Title()
-
-    @security.public
-    def getClientUID(self):
-        """Used to populate catalog values.
-        Returns the UID of the client for this analysis' AR.
+    def getClient(self):
+        """Returns the Client this analysis is bound to, if any
         """
         request = self.getRequest()
-        if request:
-            client = request.getClient()
-            if client:
-                return client.UID()
-
-    @security.public
-    def getClientURL(self):
-        """This method is used to populate catalog values
-        Returns the URL of the client for this analysis' AR.
-        """
-        request = self.getRequest()
-        if request:
-            client = request.getClient()
-            if client:
-                return client.absolute_url_path()
+        return request and request.getClient() or None
 
     @security.public
     def getClientOrderNumber(self):
diff --git a/bika/lims/content/analysisprofile.py b/bika/lims/content/analysisprofile.py
index 0bed7e5583..42c4f2a8a6 100644
--- a/bika/lims/content/analysisprofile.py
+++ b/bika/lims/content/analysisprofile.py
@@ -33,6 +33,8 @@
 from bika.lims.config import PROJECTNAME
 from bika.lims.content.bikaschema import BikaSchema
 from Products.Archetypes.public import *
+
+from bika.lims.content.clientawaremixin import ClientAwareMixin
 from bika.lims.interfaces import IAnalysisProfile, IDeactivable
 from Products.Archetypes.references import HoldingReference
 from Products.ATExtensions.field import RecordsField
@@ -41,6 +43,7 @@
 from zope.interface import Interface, implements
 import sys
 from bika.lims.interfaces import IAnalysisProfile
+from bika.lims.interfaces import IClient
 
 schema = BikaSchema.copy() + Schema((
     StringField('ProfileKey',
@@ -145,7 +148,8 @@
 schema['description'].widget.visible = True
 IdField = schema['id']
 
-class AnalysisProfile(BaseContent):
+
+class AnalysisProfile(BaseContent, ClientAwareMixin):
     security = ClassSecurityInfo()
     schema = schema
     displayContentsTab = False
@@ -156,9 +160,6 @@ def _renameAfterCreation(self, check_auto_id=False):
         from bika.lims.idserver import renameAfterCreation
         renameAfterCreation(self)
 
-    def getClientUID(self):
-        return self.aq_parent.UID()
-
     def getAnalysisServiceSettings(self, uid):
         """ Returns a dictionary with the settings for the analysis
             service that match with the uid provided.
diff --git a/bika/lims/content/analysisrequest.py b/bika/lims/content/analysisrequest.py
index a1273cc173..2982dff1e0 100644
--- a/bika/lims/content/analysisrequest.py
+++ b/bika/lims/content/analysisrequest.py
@@ -49,9 +49,12 @@
 from bika.lims.config import PROJECTNAME
 from bika.lims.content.analysisspec import ResultsRangeDict
 from bika.lims.content.bikaschema import BikaSchema
+from bika.lims.content.clientawaremixin import ClientAwareMixin
 from bika.lims.interfaces import IAnalysisRequest
 from bika.lims.interfaces import IAnalysisRequestPartition
+from bika.lims.interfaces import IBatch
 from bika.lims.interfaces import ICancellable
+from bika.lims.interfaces import IClient
 from bika.lims.interfaces import ISubmitted
 from bika.lims.permissions import FieldEditBatch
 from bika.lims.permissions import FieldEditClient
@@ -1095,14 +1098,6 @@
             },
         ),
     ),
-    # TODO-catalog: move all these computed fields to methods
-    ComputedField(
-        'ClientUID',
-        expression='here.aq_parent.UID()',
-        widget=ComputedWidget(
-            visible=False,
-        ),
-    ),
 
     ComputedField(
         'SampleTypeTitle',
@@ -1190,27 +1185,6 @@
                    "if here.getBatch() else ''",
         widget=ComputedWidget(visible=False),
     ),
-    ComputedField(
-        'ClientUID',
-        expression="here.getClient().UID() if here.getClient() else ''",
-        widget=ComputedWidget(visible=False),
-    ),
-    ComputedField(
-        'ClientID',
-        expression="here.getClient().getClientID() if here.getClient() else ''",
-        widget=ComputedWidget(visible=False),
-    ),
-    ComputedField(
-        'ClientTitle',
-        expression="here.getClient().Title() if here.getClient() else ''",
-        widget=ComputedWidget(visible=False),
-    ),
-    ComputedField(
-        'ClientURL',
-        expression="here.getClient().absolute_url_path() " \
-                   "if here.getClient() else ''",
-        widget=ComputedWidget(visible=False),
-    ),
     ComputedField(
         'ContactUsername',
         expression="here.getContact().getUsername() " \
@@ -1417,7 +1391,7 @@
 schema.moveField("PrimaryAnalysisRequest", before="Client")
 
 
-class AnalysisRequest(BaseFolder):
+class AnalysisRequest(BaseFolder, ClientAwareMixin):
     implements(IAnalysisRequest, ICancellable)
     security = ClassSecurityInfo()
     displayContentsTab = False
@@ -1456,14 +1430,17 @@ def Description(self):
         return safe_unicode(descr).encode('utf-8')
 
     def getClient(self):
-        if self.aq_parent.portal_type == 'Client':
+        """Returns the client this object is bound to. We override getClient
+        from ClientAwareMixin because the "Client" schema field is only used to
+        allow the user to set the client while creating the Sample through
+        Sample Add form, but cannot be changed afterwards. The Sample is
+        created directly inside the selected client folder on submit
+        """
+        if IClient.providedBy(self.aq_parent):
             return self.aq_parent
-        if self.aq_parent.portal_type == 'Batch':
+        if IBatch.providedBy(self.aq_parent):
             return self.aq_parent.getClient()
-        return ''
-
-    def getClientPath(self):
-        return "/".join(self.aq_parent.getPhysicalPath())
+        return None
 
     def getProfilesTitle(self):
         return [profile.Title() for profile in self.getProfiles()]
diff --git a/bika/lims/content/analysisspec.py b/bika/lims/content/analysisspec.py
index 790b13129f..114d74ba7d 100644
--- a/bika/lims/content/analysisspec.py
+++ b/bika/lims/content/analysisspec.py
@@ -25,6 +25,7 @@
 from bika.lims.browser.widgets import AnalysisSpecificationWidget
 from bika.lims.config import PROJECTNAME
 from bika.lims.content.bikaschema import BikaSchema
+from bika.lims.content.clientawaremixin import ClientAwareMixin
 from bika.lims.interfaces import IAnalysisSpec, IDeactivable
 from Products.Archetypes import atapi
 from Products.Archetypes.public import BaseFolder
@@ -40,6 +41,7 @@
 from zope.i18n import translate
 from zope.interface import implements
 
+from bika.lims.interfaces import IClient
 
 schema = Schema((
 
@@ -131,7 +133,7 @@
 schema['title'].required = True
 
 
-class AnalysisSpec(BaseFolder, HistoryAwareMixin):
+class AnalysisSpec(BaseFolder, HistoryAwareMixin, ClientAwareMixin):
     """Analysis Specification
     """
     implements(IAnalysisSpec, IDeactivable)
@@ -208,9 +210,6 @@ def getSampleTypes(self, active_only=True):
             lambda brain: (brain.UID, brain.Title), results)
         return DisplayList(sampletypes)
 
-    def getClientUID(self):
-        return self.aq_parent.UID()
-
 
 atapi.registerType(AnalysisSpec, PROJECTNAME)
 
diff --git a/bika/lims/content/arreport.py b/bika/lims/content/arreport.py
index eb82fea40c..b6ca51e35f 100644
--- a/bika/lims/content/arreport.py
+++ b/bika/lims/content/arreport.py
@@ -26,6 +26,7 @@
 from bika.lims.browser.widgets import ReferenceWidget
 from bika.lims.config import PROJECTNAME
 from bika.lims.content.bikaschema import BikaSchema
+from bika.lims.content.clientawaremixin import ClientAwareMixin
 from bika.lims.interfaces import IARReport
 from plone.app.blob.field import BlobField
 from Products.Archetypes import atapi
@@ -136,7 +137,7 @@
 schema["title"].required = False
 
 
-class ARReport(BaseFolder):
+class ARReport(BaseFolder, ClientAwareMixin):
     """An AnalysisRequest report, containing the report itself in pdf and html
        format. It includes information about the date when was published, from
        whom, the report recipients (and their emails) and the publication mode
diff --git a/bika/lims/content/artemplate.py b/bika/lims/content/artemplate.py
index 0109eaa45c..4e61f9b88a 100644
--- a/bika/lims/content/artemplate.py
+++ b/bika/lims/content/artemplate.py
@@ -30,6 +30,7 @@
 from bika.lims.browser.widgets import RemarksWidget
 from bika.lims.config import PROJECTNAME
 from bika.lims.content.bikaschema import BikaSchema
+from bika.lims.content.clientawaremixin import ClientAwareMixin
 from bika.lims.interfaces import IARTemplate, IDeactivable
 from Products.Archetypes.public import BaseContent
 from Products.Archetypes.public import BooleanField
@@ -299,7 +300,7 @@
 schema["title"]._validationLayer()
 
 
-class ARTemplate(BaseContent):
+class ARTemplate(BaseContent, ClientAwareMixin):
     security = ClassSecurityInfo()
     schema = schema
     displayContentsTab = False
@@ -326,13 +327,6 @@ def AnalysisProfiles(self, instance=None):
         items = [["", ""]] + list(items)
         return DisplayList(items)
 
-    def getClientUID(self):
-        """This populates the getClientUID catalog
-        If the parent is the system bika_artemplates folder,
-        then that folder's UID must be returned in this index.
-        """
-        return self.aq_parent.UID()
-
     def getAnalysisServiceSettings(self, uid):
         """Returns a dictionary with the settings for the analysis service that
            match with the uid provided.
diff --git a/bika/lims/content/attachment.py b/bika/lims/content/attachment.py
index 6a9b390842..2b25511687 100644
--- a/bika/lims/content/attachment.py
+++ b/bika/lims/content/attachment.py
@@ -27,6 +27,7 @@
 from bika.lims.config import ATTACHMENT_REPORT_OPTIONS
 from bika.lims.config import PROJECTNAME
 from bika.lims.content.bikaschema import BikaSchema
+from bika.lims.content.clientawaremixin import ClientAwareMixin
 from bika.lims.interfaces.analysis import IRequestAnalysis
 from DateTime import DateTime
 from plone.app.blob.field import FileField
@@ -96,7 +97,7 @@
 schema["title"].required = False
 
 
-class Attachment(BaseFolder):
+class Attachment(BaseFolder, ClientAwareMixin):
     """Attachments are stored per client and can be linked to ARs or Analyses
     """
     security = ClassSecurityInfo()
@@ -136,15 +137,6 @@ def getAttachmentTypeUID(self):
             return ""
         return api.get_uid(attachment_type)
 
-    @security.public
-    def getClientUID(self):
-        """Return the UID of the client
-        """
-        client = api.get_parent(self)
-        if not client:
-            return ""
-        return api.get_uid(client)
-
     @security.public
     def getLinkedRequests(self):
         """Lookup linked Analysis Requests
diff --git a/bika/lims/content/batch.py b/bika/lims/content/batch.py
index 52c46c9b05..1d9969af83 100644
--- a/bika/lims/content/batch.py
+++ b/bika/lims/content/batch.py
@@ -30,6 +30,7 @@
 from bika.lims.catalog import CATALOG_ANALYSIS_REQUEST_LISTING
 from bika.lims.config import PROJECTNAME
 from bika.lims.content.bikaschema import BikaFolderSchema
+from bika.lims.content.clientawaremixin import ClientAwareMixin
 from bika.lims.interfaces import IBatch
 from bika.lims.interfaces import ICancellable
 from bika.lims.interfaces import IClient
@@ -142,7 +143,7 @@ def BatchDate(instance):
 schema.moveField('Client', after='title')
 
 
-class Batch(ATFolder):
+class Batch(ATFolder, ClientAwareMixin):
     """A Batch combines multiple ARs into a logical unit
     """
     implements(IBatch, ICancellable)
@@ -159,8 +160,9 @@ def _renameAfterCreation(self, check_auto_id=False):
     def getClient(self):
         """Retrieves the Client the current Batch is assigned to
         """
-        # The schema's field Client is only used to allow the user to assign
-        # the batch to a client in edit form. The entered value is used in
+        # We override here getClient from ClientAwareMixin because te schema's
+        # field Client is only used to allow the user to assign the batch to a
+        # client in edit form. The entered value is used in
         # ObjectModifiedEventHandler to move the batch to the Client's folder,
         # so the value stored in the Schema's is not used anymore
         # See https://github.com/senaite/senaite.core/pull/1450
@@ -169,20 +171,6 @@ def getClient(self):
             return client
         return None
 
-    def getClientTitle(self):
-        client = self.getClient()
-        if client:
-            return client.Title()
-        return ""
-
-    def getClientUID(self):
-        """This index is required on batches so that batch listings can be
-        filtered by client
-        """
-        client = self.getClient()
-        if client:
-            return client.UID()
-
     def getContactTitle(self):
         return ""
 
diff --git a/bika/lims/content/clientawaremixin.py b/bika/lims/content/clientawaremixin.py
new file mode 100644
index 0000000000..42397a89cf
--- /dev/null
+++ b/bika/lims/content/clientawaremixin.py
@@ -0,0 +1,60 @@
+from AccessControl import ClassSecurityInfo
+from Products.Archetypes.BaseObject import BaseObject
+from zope.interface import implements
+
+from bika.lims import api
+from bika.lims.interfaces import IClient
+from bika.lims.interfaces import IClientAwareMixin
+from bika.lims.utils import chain
+
+
+class ClientAwareMixin(BaseObject):
+    implements(IClientAwareMixin)
+
+    security = ClassSecurityInfo()
+
+    @security.public
+    def getClient(self):
+        """Returns the Client the object is bound to, if any
+        """
+        # Look in the acquisition chain
+        for obj in chain(self):
+            if IClient.providedBy(obj):
+                return obj
+
+        # Look in Schema
+        client_field = self.Schema().get("Client", default=None)
+        if client_field:
+            client = client_field.get(self)
+            client = api.get_object(client, None)
+            if client and IClient.providedBy(client):
+                return client
+
+        # No client bound
+        return None
+
+    @security.public
+    def getClientUID(self):
+        """Returns the Client UID the object is bound to, if any
+        """
+        client = self.getClient()
+        return client and api.get_uid(client) or ""
+
+    @security.public
+    def getClientID(self):
+        """Returns the Client ID the object is bound to, if any
+        """
+        client = self.getClient()
+        return client and client.getClientID() or ""
+
+    @security.public
+    def getClientTitle(self):
+        """Returns the Client Title the object is bound to, if any
+        """
+        client = self.getClient()
+        return client and client.Title() or ""
+
+    @security.public
+    def getClientURL(self):
+        client = self.getClient()
+        return client and client.absolute_url_path() or ""
diff --git a/bika/lims/content/report.py b/bika/lims/content/report.py
index 51fe10e17f..1f2ee267be 100644
--- a/bika/lims/content/report.py
+++ b/bika/lims/content/report.py
@@ -27,6 +27,7 @@
 from bika.lims.content.bikaschema import BikaSchema
 from bika.lims.config import PROJECTNAME
 from bika.lims import bikaMessageFactory as _
+from bika.lims.content.clientawaremixin import ClientAwareMixin
 from bika.lims.utils import t
 from bika.lims.browser import ulocalized_time
 from bika.lims.utils import user_fullname
@@ -56,7 +57,7 @@
 schema['id'].required = False
 schema['title'].required = False
 
-class Report(BaseFolder):
+class Report(BaseFolder, ClientAwareMixin):
     security = ClassSecurityInfo()
     displayContentsTab = False
     schema = schema
@@ -71,13 +72,6 @@ def current_date(self):
         """ return current date """
         return DateTime()
 
-    @security.public
-    def getClientUID(self):
-        client = self.getClient()
-        if client:
-            return client.UID()
-        return ''
-
     @security.public
     def getCreatorFullName(self):
         return user_fullname(self, self.Creator())
@@ -89,19 +83,4 @@ def getFileSize(self):
             return '%sKb' % (file.get_size() / 1024)
         return ''
 
-    @security.public
-    def getClientURL(self):
-        client = self.getClient()
-        if client:
-            return client.absolute_url_path()
-        return ''
-
-    @security.public
-    def getClientTitle(self):
-        client = self.getClient()
-        if client:
-            return client.Title()
-        return ''
-
-
 atapi.registerType(Report, PROJECTNAME)
diff --git a/bika/lims/content/samplepoint.py b/bika/lims/content/samplepoint.py
index d0202aaac2..c15c44536f 100644
--- a/bika/lims/content/samplepoint.py
+++ b/bika/lims/content/samplepoint.py
@@ -44,6 +44,7 @@
     ReferenceWidget as BikaReferenceWidget
 from bika.lims.config import PROJECTNAME
 from bika.lims.content.bikaschema import BikaSchema
+from bika.lims.content.clientawaremixin import ClientAwareMixin
 from bika.lims.interfaces import IDeactivable
 from plone.app.blob.field import FileField as BlobFileField
 from zope.interface import implements
@@ -125,7 +126,7 @@
 schema['description'].schemata = 'default'
 
 
-class SamplePoint(BaseContent, HistoryAwareMixin):
+class SamplePoint(BaseContent, HistoryAwareMixin, ClientAwareMixin):
     implements(IDeactivable)
     security = ClassSecurityInfo()
     displayContentsTab = False
@@ -202,9 +203,6 @@ def setSampleTypes(self, value, **kw):
     def getSampleTypes(self, **kw):
         return self.Schema()['SampleTypes'].get(self)
 
-    def getClientUID(self):
-        return self.aq_parent.UID()
-
 
 registerType(SamplePoint, PROJECTNAME)
 
diff --git a/bika/lims/interfaces/__init__.py b/bika/lims/interfaces/__init__.py
index acf1230569..3116794db7 100644
--- a/bika/lims/interfaces/__init__.py
+++ b/bika/lims/interfaces/__init__.py
@@ -983,4 +983,19 @@ def get_object_info(self):
           applied when the value of current field changes.
         - field_values: contains default values for other fields to be applied
           when the value of the current field changes.
-        """
\ No newline at end of file
+        """
+
+
+class IClientAwareMixin(Interface):
+    """Marker interface for objects that can be bound to a Client, either
+    because they can be added inside a Client folder or because it can be
+    assigned through a Reference field
+    """
+
+    def getClient(self):
+        """Returns the client this object is bound to, if any
+        """
+
+    def getClientUID(self):
+        """Returns the client UID this object is bound to, if any
+        """
diff --git a/bika/lims/interfaces/analysis.py b/bika/lims/interfaces/analysis.py
index 88bc2ee8c6..f5b61a5926 100644
--- a/bika/lims/interfaces/analysis.py
+++ b/bika/lims/interfaces/analysis.py
@@ -59,16 +59,16 @@ def getClient(self):
         :rtype: IClient"""
 
     def getClientID(self):
-        """Returns the UID of the Client assigned to the Analysis Request this
-        analysis belongs to. Returns None if there is no Request nor a Client
+        """Returns the ID of the Client assigned to the Analysis Request this
+        analysis belongs to. Returns empty if there is no Request nor a Client
         assigned to this analysis
-        :return: the UID of the Client
+        :return: the ID of the Client
         :rtype: str
         """
 
     def getClientUID(self):
         """Returns the UID of the Client assigned to the Analysis Request this
-        analysis belongs to. Returns None if there is no Request nor a Client
+        analysis belongs to. Returns empty if there is no Request nor a Client
         assigned to this analysis
         :return: the UID of the Client
         :rtype: str
@@ -76,7 +76,7 @@ def getClientUID(self):
 
     def getClientTitle(self):
         """Returns the name of the Client assigned to the Analysis Request this
-        analysis belongs to. Returns None if there is no Request nor a Client
+        analysis belongs to. Returns empty if there is no Request nor a Client
         assigned to this analysis
         :return: the name of the Client
         :rtype: str
@@ -84,7 +84,7 @@ def getClientTitle(self):
 
     def getClientURL(self):
         """Returns the absolute url path of the Client assigned to the Analysis
-        Request this analysis belongs to. Returns None if there is no Request
+        Request this analysis belongs to. Returns empty if there is no Request
         nor a Client assigned to this analysis
         :return: the url path of the Client
         :type: str
diff --git a/bika/lims/upgrade/v01_03_003.py b/bika/lims/upgrade/v01_03_003.py
index e005b91bd8..5775233b8e 100644
--- a/bika/lims/upgrade/v01_03_003.py
+++ b/bika/lims/upgrade/v01_03_003.py
@@ -18,6 +18,9 @@
 # Copyright 2018-2019 by it's authors.
 # Some rights reserved, see README and LICENSE.
 
+from Products.Archetypes.config import UID_CATALOG
+
+from bika.lims import api
 from bika.lims import logger
 from bika.lims.config import PROJECTNAME as product
 from bika.lims.setuphandlers import setup_form_controller_actions
@@ -47,9 +50,45 @@ def upgrade(tool):
     # https://github.com/senaite/senaite.core/pull/1469
     setup.runImportStepFromProfile(profile, "propertiestool")
 
+    # Reindex client's related fields (getClientUID, getClientTitle, etc.)
+    # https://github.com/senaite/senaite.core/pull/1477
+    reindex_client_fields(portal)
+
     # Redirect to worksheets folder when a Worksheet is removed
     # https://github.com/senaite/senaite.core/pull/1480
     setup_form_controller_actions(portal)
 
     logger.info("{0} upgraded to version {1}".format(product, version))
     return True
+
+
+def reindex_client_fields(portal):
+    logger.info("Reindexing client fields ...")
+    fields_to_reindex = [
+        "getClientUID",
+        "getClientID",
+        "getClientTitle",
+        "getClientURL"
+    ]
+
+    # We only need to reindex those that might be associated to a Client object.
+    # There is no need to reindex objects that already belong to a Client.
+    # Batches were correctly indexed in previous upgrade step
+    portal_types = [
+        "AnalysisProfile",
+        "AnalysisSpec",
+        "ARTemplate",
+        "SamplePoint"
+    ]
+
+    query = dict(portal_type=portal_types)
+    brains = api.search(query, UID_CATALOG)
+    total = len(brains)
+    for num, brain in enumerate(brains):
+        if num and num % 100 == 0:
+            logger.info("Reindexing client fields: {}/{}".format(num, total))
+
+        obj = api.get_object(brain)
+        obj.reindexObject(idxs=fields_to_reindex)
+
+    logger.info("Reindexing client fields ... [DONE]")
diff --git a/bika/lims/utils/__init__.py b/bika/lims/utils/__init__.py
index 457dc53e03..7bf8020d3f 100644
--- a/bika/lims/utils/__init__.py
+++ b/bika/lims/utils/__init__.py
@@ -26,6 +26,8 @@
 from AccessControl import ModuleSecurityInfo
 from AccessControl import allow_module
 from AccessControl import getSecurityManager
+from Acquisition import aq_inner
+from Acquisition import aq_parent
 from email import Encoders
 from time import time
 
@@ -51,6 +53,9 @@
 from zope.i18n import translate
 from zope.i18n.locales import locales
 
+from bika.lims.interfaces import IClient
+from bika.lims.interfaces import IClientAwareMixin
+
 ModuleSecurityInfo('email.Utils').declarePublic('formataddr')
 allow_module('csv')
 
@@ -899,3 +904,43 @@ def to_choices(display_list):
             "ResultValue": item[0],
             "ResultText": item[1]},
         display_list.items())
+
+
+def chain(obj):
+    """Generator to walk the acquistion chain of object, considering that it
+    could be a function.
+
+    If the thing we are accessing is actually a bound method on an instance,
+    then after we've checked the method itself, get the instance it's bound to
+    using im_self, so that we can continue to walk up the acquistion chain from
+    it (incidentally, this is why we can't juse use aq_chain()).
+    """
+    context = aq_inner(obj)
+
+    while context is not None:
+        yield context
+
+        func_object = getattr(context, "im_self", None)
+        if func_object is not None:
+            context = aq_inner(func_object)
+        else:
+            # Don't use aq_inner() since portal_factory (and probably other)
+            # things, depends on being able to wrap itself in a fake context.
+            context = aq_parent(context)
+
+
+def get_client(obj):
+    """Returns the client the object passed-in belongs to, if any
+
+    This walks the acquisition chain up until we find something which provides
+    either IClient or IClientAwareMixin
+    """
+    for obj in chain(obj):
+        if IClient.providedBy(obj):
+            return obj
+        elif IClientAwareMixin.providedBy(obj):
+            # ClientAwareMixin can return a Client, even if there is no client
+            # in the acquisition chain
+            return obj.getClient()
+
+    return None