fixed customer addresses again - issue #64; updated tests; fixed filtering;