Additional fields in Passwordstate window

Hello,
I am using Passworstate as passwords vault and there are two annoying "issues" in the selecting password window:

1. I can not know what server I selecting password for
2. If there are multiple password for same server, I can not know what I am selecting

1
Starting from this window


I for example I have to reopen several sessions after a restart, I can not see what server the password I am selecting is related to. It might me very useful to put in this windows the name of the session is related to.

2
If I have to select a password from a server that has more than one password saved, I can not see what username I am selecting
so place username together to the name of the password might be the definitive solution.

Thanks in advance.

Bye.

Alessio