KD: Code clean up
KD: Update search interface