changed data watch to reload data as long as newvalue or oldvalue exists

related to implementation of https://ioffice.myjetbrains.com/youtrack/issue/io-2086