Added all fields and got selection working