Update random choice behavior
Fix merge conflicts and http code bug