Modified the SearchResultForm
Resolved conflicts
Resolve conflicts
Resolve Conflicts