Updates from core (sortation fix when searching by text)