Added count incrementation. Still duplicates within queries