Don't retrieve $id unless set
Added 1-click upgrade faq