issues counter refactored