Added check for question definitions in QL from QLS
Merged conflicts