Cleaner unifield

![unifield-search](https://f.cloud.github.com/assets/138627/1422914/59671c10-4002-11e3-8d3a-9458588a2e9a.gif)