[bugfix][cleanup] some bug fixes and cleanup after knot list refactor