Fixed indentation, cookies and entity