Change filter config to add the 'empty' choice only when defined