#50 Quick fix for searching