fixes frontpage and show events
fixes merge conflict