Fixing search, oh yea!
fixing conflict
Fixes to search and edits on add form