Filter choice save
Removed list enabling at choice
Fixed merge