Removed some join to speed up default base
Revert previous change