Best products to detangle baby's curly hair?

My DD is black/pacific islander and she has gorgeous curly hair. Not kinky curly, just corkscrew and waves. At the end of the day her hair is a hot mess of tangles, so I've been using some baby detangler (Johnson & Johnson I think) every night. But I really don't like it- it sort of leaves a film on her hair. Anyone with mixed babies know what works well for their hair? I'm not using any other products except detangler, but still I want to use something good that won't damage her hair so early. Thanks!