10 Change sql and tag name