Fixed some issues caused by last commit, need to fix add_event redirect.