fixed some queries
hide counter when it is zero