work on recent query
cleanup