speed ups

count(*) to count(1) for speed improove