SBTWO-6170 Make Bootstrap selectors more concise - fixes SBTWO-6362