Fixed some scenarios due to changes in eZDemo content