Swapping for the queryable version of the address points layer