Added excluding of disabled elements of scanning
refs #504
Added simple checking if group is empty
refs #504
Merge branch 'scanning-disabled'