Fix empty conditions
Remove filter (ordering) from scopes