Optimizations

Eager load children and entity types
Don't nullify blank values
Add filtering to entity types.

Also add child fields to entity_type serializer