BM - More work on m3u import