Private goals and dashboard filtering
fixed merge conflicts for private goals and filtering