Fixed some issues with NULL values

Chosen entries were not being removed upon update when removed fromt he
UI. Improved UI a tich (naming).