added lavatory id to output of query; more debugs for distance