Fix some issues with criterias for sort feeds