click and collect bug fixes