Fix auto collection selection