wrong query was used to check for datatypes (or instead of and)
Merge branch 'IlwisCore/master'