[perf] Improve polish map, less sql queries