Better location query mechanism

+ fix override / update WE dependency version in pom