May 12 fixes

Matching: wireless/wired and removing "staff" counts