Updated suggestions controller with some refactoring