Can we have a better way to search for DPS and elemental DPS for weapons?

Seriously, every time I have to search for a weapon, I have to get my calculator out and calculate.
also, if there is rune socketed oh man.
We need to change this search. This is very time consuming and frustrating. Wouldn't there be a better way? Or am I doing it wrong?


Same with armour with runes. Anyway, we need a better search tool.