Fix some stupid threadupdater issues, more navigate from catalog js