Cat Selector tweaks