Fixing 133 migration - search improvements