Adding Composer to Work using Minimserver/SongKong

[HardBop]

Simon, I've been exchanging posts with Paul Taylor on the SongKong forum regarding trying to accurately format my albums by adding Composer to Work. However, in working through this I have an issue which I'll explain below for which Paul suggested I use the Minimserver forum.
In auto and manually editing albums in SongKong I have found that whilst the separate Works are correctly displayed under "Work" on my Naim App/iPad control point and sorted by Composer now, I have lost the display of the whole album (all works in that album) which previously were displayed in for example, "Albums" and in "Complete Album" in the Work tab. It is useful for albums that contain many short works to be able to play the whole album rather than having to open and play each Work (track(s)) separately. I believe this has been caused by my duplicating the songs (tracks) in Work and Minimserver Group on SongKong??
I have experimented with one album by removing the Minimserver Group entries for each song, which re-instates the complete album option but then does not enable me to play each "work" from that album, it only lists the separate songs (tracks) for the work from that album.
So ideally what I would like is to retain the option of playing the whole album, through selection using any of the tabs e.g. album, composer, but retain the option of selecting individual works through the "Work" tab.
Is this feasible and how do I get to this point?
Many thanks.