MADS: Fix setting category/desc Id from highlighted screen elements