add limit in tag and category
merge master