make query work
clean