Improve autoselect and add support for relators