Looks good(aka logic should be more stable now), but seems to remove always_available handling which was fix for missing display of always_available objects some revisions ago.