Cleanup defauly.py code, proper fix for no favourites/ no add-ons