reformat of Query's + cleanup (backend)