[V0.4] Implementing Search and Mark features