Fix bugs filter swap tail by one