Recommended gem selection for support & spirit gems needs improvement

I'm playing with 3 friends who are brand new to PoE, and I can see them constantly making poor gem selection choices due to the recommended gem system.

It's mostly true for support gems, and to a certain extent for buffs. The main skill selection is good.

Some examples -
1. The best way to level infernalist is with summon raging spirit, yet this is not shown in the recommended.
2. Best supports for a lot of attack based builds is martial tempo. For some reason, this doesn't show up as recommended on a lot of skills.
3. Same as above for arcane tempo & casters.

Suggestion -
- Expand the selection to double/triple the no. of support gems.
- Show all the buffs for spirit gems (there aren't that many)
- only gray out the gems that are N/A based on equipped weapon.