Slightly refactoring views to avoid single-line nesting and simplifying the server-side sort on urgency