dotdotdot fixed
search added
sorting added
before merge develop
merge refact with develop