BUG FIX: search now working properly