Fixed pre_select handler of menu by removing all but what's needed for selection