Selective searching
Fix message and challenge visibility