manufactureQuery fix