selector bug fixes