fix imports
continue trying to improve queries