handleClientClick now will set target appropriately