UI improvement.
Modified text matching logic.