Selected options should now load with correct values