Fixed conditionals and ...

... found cause for broken typed question matching
Merge branch 'kemi' of https://github.com/software-engineering-amsterdam/sea-of-ql into kemi