[z2147] Improve spell target checks for targets with pre-filling target type

(based on commit [12226] - 1fc9f41)

(based on commit [s1777] - 2fc6473)