Fix NPE
Update content
Update version to 22