Added filtering on timestamp for some rules