CMS-872 "Tab" selector fixes