Search fixes

Note: Haz migration script...