add logout and tweak carpool query