Making the organization urls more seo friendly - issue #37