fix 50% of creator populate bug, multiple refactor