Added support for quoted terms containing spaces - REPORT-247