Add options to include and exclude be name

Also remove short option for sort