Migration changes and fix to search.