I have the same problem (still). My current solution is to use synapse, which offers a very good search functionality. Maybe it could work for you, too.