changed logic of put in queue on service and facade layers