changed eventMetrics to have consistent type with getMetrics + fixed que...

...ried timeframe