Removed trace mode stuff, and check for sWhere so as to avoid Redis lookup.