Update combo values, remove empty strings