id -> user_id etc bug fix