Fixed issues with Organizer's foreign keys