Fix issue with word cloud which is diplayed regardless of returned data
Fix aggregation
Another UI polishing
UI polishing
Fix off by one error :-)