ID search improved