Fixed admin loop and empty lists