Added null-safe expression. Now matches properly but we still have an issue when rendering the output. We need to switch to Jackson for JSON mappings to work properly with collections