Added tap on the tags and other improvements