[PUSH] Refactor: handle device target field in preference routing

Edited by Carina Antunes