Credentials tree expanding when credential used

Credentials subtree expands after any session uses stored credential from it - this is extremely unpleasant, because we have 100+ groups for sessions > another 100+ groups opens in "credentials" subtree > whole tree becomes to be really hard to use...
I have few suggestions that will IMHO be better than current state: 
1) Credential manager should stay collapsed until user expands it manualy (the easiest to implement)
2) Credential objects could be visible directly in their groups in "Sessions" and "Credentials" subtree could be completely disabled (IMHO quite easy to implement, good as switchable option)
3) Credential manager could act completely differently, IMO the best way is something like "embedded keepass" where you can store, generate, view and also directly use your credentials (this option will take a long research if you decide to implement it, but will provide a greatest value for enterprise users that must work with large ammount of different credentials)