Added sort order for list reports, join to location table, clean-up obsolete code