Content provider types

[kathleenahall]

Fix so that content provider calls each type separately, not all types