Still single scan

Some bugs fixed, now support count.