NCBO-228: remove hack for mapping counts
as an altenative use graphs from query to build the cache id
Merge branch 'staging'