828 optimize data retrieval and clean it up#829

bogadisa wants to merge 6 commits into

mainPath-of-Modifiers/pathofmodifiersapp:mainfrom

828-optimize-data-retrieval-and-clean-it-upPath-of-Modifiers/pathofmodifiersapp:828-optimize-data-retrieval-and-clean-it-upCopy head branch name to clipboard