fx8forms selction logic update