Refactor Search to Doctrine 2

Cherry-pick 1017c9e8ca0c214de1f327bab1bdf1690a13e032
Correct field name.