Refactor - Simplify used code regarding org-map-entries