Adjust remoteItem return behavior to return tag on empty list

Change-Id: I9b4a35e22b6d9785e9933f2702839b0e21d7def9