BZ-8628: Fix issue with get a quote behavior