Several fixes and adding Selector Feature