Better handling of find dataitem