Changes to work with the new JSON filter