Don't add ui filter for empty values; fixes #537