added if condition to prevend from being broken by the undefined variables
added one more ontology to expand terms
fixed a bug for expanding terms
added tooltip to hint users to look at expanded queries and original variable definitions