Changed the way underscores and spaces are handled when evaluating a
composition query - REPORT-247