improve presets logic