Bugfix for raw order filtering; added some failing tests as todos