Fixing field name and alignment
Merge branch 'new_search' into ie2