fixed broken commit c61ff55, rolled back to f96b202b55, then manually in...

...serted eb781f5260. Category mapping script still broken (have not touched it though)