DO NOT MERGE: Fixing Entities

I thing small string should be default. Number 10 was arbitrary.