Improved work with MS2 multi categories