Added support for default values in scenarios (property filtering)