Fixed search for containing table view, fixes #527
Merge branch 'od/issue_527' into develop