Fix empty search term bug. More updates to come...