refactored to not use eval()
fix layout issue for thinned screens
refactored queryEngine to export the module, not the class