CON-1005 | expanded the general input selector