add redirect to controllers, add htmlentities where heeded