Fix a bug, add faster construction
Merge pull request #5182 from ericvaandering/More_LumiList_improvements

Fix a bug, add faster construction