Adding proper sanitization
Merge branch 'guest-author'