improved code regarding without store 'website_private' field