More WIP on Kv17 - fix import and finish selection interface