support more entry types for -S and -Q