Bug 924988: Improvements to Music2 DB Loading