Dev fix: Update filter formatters to deal with null / undefined data