Add better support for auto, with several options searched