almost done
Merge branch 'detailsearch' into development