Fixed bug with tag selection