Improved switching between the normal and NoJS version
(now preserves the album id)