Industry wise filtering..

And minor fixes.