Fixed select and clear