Streamline place suggestions

Streamline place suggestions. Make sure the underlying objects
reflect what is displayed to the user

Signed-off-by: Jason Rogena <jasonrogena@gmail.com>