fix(import): Make sure query context is overwritten for overwriting imports

fix(import): Make sure query context is overwritten for overwriting imports #36355