Clean schema
Fix search autocomplete