fix regression
refactored into own method
rm temp dev code
refactoring
refactored naming of lightbox entity