fix: organisation_ctx now preserves current URL