Sort guests - fix forms