Add some support for user choice when multiple entries match
Add support for KeePass 2.x databases