improve select
improve categories
fix categories