,NULL AS recalled, mission
FROM fleets f
WHERE pid = $2 AND tick <= tick() AND tick >= tick() - 24
- AND name IN ('Main','Advanced Unit') AND mission = 'Full fleet'
+ AND name IN ('Main', 'Advanced Unit', 'Military') AND mission = 'Full fleet'
ORDER BY mission,name,tick DESC, fid DESC
) UNION (
SELECT fid,name,landing_tick AS tick, eta, amount