Function renaming to make more homogeneous
Introduce search bar and make search stuff more generic
...