Bug fix in import
Import public resources by constraints with models. Code inspection and clean