fixed #27 and changed expression to select2