rearrange querybuilder completion condition checks, to do all the stuff after method match #371