Minor improvements on preset handing ref #2