CQP: Incorrect span serialization in "within"

[margaretha]

Span segments in within queries are not serialized properly. Foundry and layer are not serialized.

Example query:

[tt/p="NN"] within <corenlp/c=NP>

Serialization:

{
    "query": {
        "operands": [
            {
                "@type": "koral:span",
                "wrap": {
                    "@type": "koral:term",
                    "key": "NP"
                }
            },
            {
                "@type": "koral:token",
                "wrap": {
                    "foundry": "tt",
                    "@type": "koral:term",
                    "match": "match:eq",
                    "type": "type:regex",
                    "key": "NN",
                    "layer": "p"
                }
            }
        ],
        "frames": ["frames:isAround"],
        "@type": "koral:group",
        "operation": "operation:position"
    },
    "@context": "http://korap.ids-mannheim.de/ns/koral/0.3/context.jsonld"
}