Add an option to exclude empty fields