SRP refactoring on MetadaQuery -> OptionPropertyQuery on OptionMap.