Updated tags
Finished updating with new orderBy property syntax