Fixed online list but only for local, still need to do server side