Wa collector speedup

Created by: credp

Just got a bit frustrated with the speed of loading wa results on my machine, so I made a few edits. For me, this significantly reduces loading time and improves the time spent doing reports.