don't use "expand" for mode= requests or non-analyze requests