search fixed
Merge branch 'views' into development