Fixing some issues

Avoiding empty values
Avoiding adding values not selected #Fixes 2
Adding less mixing #4