Fix show/ hide categories
Fix uncluster bug