fixed index focus bug and add vanilla