add tag
fix bug, filter logic expression