Reflect custom value in autocomplete results

/cc @ciniglio @wija 

bone changes to stay current with adaptly-bone edge