Start migration towards tag based searches