ORG-876: Update search function