better options matching
Merge pull request #263 from kubked/fix/categories-import

FIX better options matching
Merge branch 'develop' into model-lookup