LPS-45770 Replace deprecated method
LPS-45770 Sort by asset type
LPS-45770 Rename