Resolve "MINERVANET - Error Report 4258"

Merged Piotr Gawron requested to merge 1846-data-overlay-entry-matching-to-everything into devel_16.2.x

Closes #1846

Merge request reports