Improved resource grouping
Improved resource grouping & sorting
Merge branch 'feature/url-grouping' into develop