Tightened up result table.

This fixes #22
Fixed #8 by populating new searches with old criteria