added bali search, changed names of vars
Merge origin/InDev into InDev