rsvp and js bug fix