And consistency with album identifier. Part 3 of #231 Reviewed-on: #241
Part 1 of #231 Reviewed-on: #238