behave better when there is no --query and no --hydrate
upped version