Added filtration for orders