[perf] Improve polish map, less sql queries
[fix?] Attempt to make the abort for upload work

only for photos so far