servicepicker directive improved