TODO: modify query to use object_type pretty_name