added labels, added filter by name