Changed routes, controller refactor for index and search actions