Adjusted Routes and Views to support robust query results