Add count_* queries