Add indicators for cd4 counts

Add cd4 indicators, which require a new calculator type (filtering in numeric range).

Also snuck in a correction to another indicator where I failed on copy/paste.