CLDIDE-1613: fix double decoding of factory query parameters