Fix collpased metric count issue.
Fix collpased metric count issue.

 * Remove count display for non-collapsed metrics coming along with
   collpased ones.
 * Remove simple metrics from expand requests.

Skrupellos/facette,yonglehou/facette,githubert/facette,yonglehou/facette,githubert/facette,vovkasm/facette,hirocaster/facette,iaean/facette,psytra/facette,facette/facette,Skrupellos/facette,facette/facette,iaean/facette,hirocaster/facette,hirocaster/facette,githubert/facette,facette/facette,vovkasm/facette,vovkasm/facette,psytra/facette,yonglehou/facette,facette/facette,Skrupellos/facette,iaean/facette,psytra/facette