Trying to fix Search and Fixed Call