Improve Working set matching for Studio