fixes for multiple code field and boolean fields