Better search query support and internal hydration