Some improvements, finally add the suggestion list

Pre 1.4.0