Fix a few bugs: repeat suggestions if there were no maps before