Merge "Add logic for "tags" in ApiBase"