fixed hardcoded object on addCurrentTokenInputValue function then added propertyToSearch on it