make selector category own generic class (instead of string), some minor extensions