Fix typo issue
Fix auto collection selection