Adding wrapper for search scope and order and search result layout