Fixed issue with time filters
Used slightly faster and easier to read method for properly evaluating time filters