Fix search feature bug

[shuvaethyneill]

Search feature that lets you search for an existing form is a bit buggy and displays duplicate results.

To do:

• investigate/debug
• fix