Bug 808660 - [Contacts] Apply BB to the value selectors

there are building blocks, changes. please file a new bug to do this and not mix it with the specific change in contacts