[PATCH] better msw selection support