Fix to ticket 1121

Includes patch to Wu Manber Finder that was only applied to master.