Added user filtering so users can only their own