Added location bubbling to completion result values

Added bubbling of locations to completion return values