Caught some edge cases
Removed default type and title
Bumped version.