fixed double rendering in planes portal (planes list view)
merged conflicts in routes for Ros and Rich's part