add count comment and fix location type