Further updates to auto suggest

More of the same.
Merge remote-tracking branch 'origin/master'

Conflicts:
	06-suggest.php