Fix select all issuse