Some modification and bugfixes in content suggestion.