Fix tps retrieval & don't retrieve empty last citizen row