Accept raw object in map filter
Fix default value fallback