tags remove click and better handling for display