Evaluate if we should merge input-builder and input-extended

[simar0at]

We had a much different and more advanced implementation of input-extended in the dictQuery branch.
When merging I could not determine if the more advanced version can serve the same purpose as input-extended for the corpus query function.
Please evaluate if it makes sense to merge input-builder and input-extended and use it in dictQuery and corpusQuery or if we should keep this separate.