REALLY fix the package browsing this time, without messing up the ordering