Some bug fixing for limited tweets