Remove extra search form
Updated Canonical Controller add
Canonical Controller add/edit tests