Selector fixes, added get