Fix disambiguation box and improve single entity search