#8: properly handling empty values in selects + tests