[*] Class: Carrier / move query in if statement