Changed to vehicle categories
changed regex
some changes