Improve normalization of variables for dropdown