Fixing select * for counters & refactoring
Merge branch 'master' of github.com:hotels-tech/metrik