LPS-48847 Instead of using url we should use value