s/permalink/models.permalink/g, add organization fields