fix selectors to work with latest toolbar