Alias search feature + fix to duplicate issue