Fixed Query Builder issues