added check if drop down exists
Merge branch 'refs/heads/hotfix-jquery-dd' into develop