extended handling for omnis dependencies, fix #2298