Better handling of large set of server items