Fixed search implementation