Include extra fields in location comparison