Fix category mapping