fix(catalog): one counting rule across surfaces; correct screencast tool count

fix(catalog): one counting rule across surfaces; correct screencast tool count #66