Feature/robustness

Make controller robust & handle empty results in views.