fixing search.json
Change language section to autopopulate and begining stages of the search
fixing merge conficts