[AI-415] Corrects mapping of site count indicators

This logic relating to filtering / querying site count indicators really
needs to be pushed down into GetSites but I want to limit risk of this
quick fix.