Fix scope issues in adding artists and songs