Add subquery selection switching

Not hooked up to serverside yet