CH-73 - Temporarily reverting search to a simple icontains database search