Fixed to return to original buffer and also highlight it properly.