Need to fix the issues with just selecting the first item