added regex around (by|on)