HPCC-9108 Solve problem not commoning up selectors

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>