Change default value/check, fix for nested snippets