Fixed a bug in baseQuery level method
Slightly enhanced toeast method in ResolutionEngine