bug fixed na query