[z2003] Change way location targeting is handled

(cleaned version of 1ee4d2d)

(based on commit [s1602] - cb1afb0)