Fixed a couple of typos
Remove any duplicate search fields of the same type
Cleaned up database backend search method