UserType2 updates, fix thing deletion to find thing type properly