Updates from core (sortation fix when searching by text)
Merge pull request #20 from nsendetzky/master

Updates from core (sortation fix when searching by text)