count on custom metric search reimplemented
Merge branch 'bugfixes'