Fixed suggestor.
Fixed ordering issues.