fixed query
no more debug variables