Improve suggestion engine