refactor
fixed category select