Fix: Search on contract ref
Fix: search on contract ref