Improvements in getByData