make the empty query better