Fix how optional field filter params are substituted; fix support for nested optional params (#10947) * Param fixes [ci skip] * Almost all working [ci skip] * Test fixes * Test fixes * Test / linter fixes * Fix linter errors
