Fixed to work with alteration to layer points table (replacing user w/ user_id column)