Added null option to selection