Fix search fields
Merge branch 'master' into rails4