Improve sameLocationType feature.