Dashboard CountSearchControlPart fix
Merge branch 'CountSearchControlPart'