New JS added to fix load bug and pull from data attr