Added filtering for points not within bucket