Added evaluation query trimming.