Change how to list KW (+Boost) + change corresp