[T5837][UPDATE] filter by stock greater than zero and minor fix

Merged Javier Vescio requested to merge T5837 into 17.0

Merge request reports