Fix size greater than 16Bits, fix remaining query is suspends