replace use of now() with os:timestamp()