some changes for customer auto complete etc