Fixing date check and adding support for trigger only action