fixing base after merging
updated places controller