Misc bug fixes, fixed http/https url storage issue