Until you allow searching across both a quick UI improvement would be to move the vault search to the top of the page and make it not full width - adding colour here would help too as I regularly click on my vault and then try and search in the main search window. A quick change here would do wonders!