Now omitting empty fields