cleaned use of AssetLookup and its derivatives
Merge branch 'develop' into model-lookup
Merge pull request #265 from xliiv/model-lookup

Asset-lookup-fix