Fixed empty search result.  This is a complete solution.