Better macro and wip for select element