Temp fix for search array problem