Changed order of overwriting for data-vars and passed in options objects