Fix empty listing and indexing

Fixes EDOZWO-189 and EDOZWO-188