Fix exapnd_uri support in suggest