Bug Fixes in select-auto