Minor changes, results should appear empty if no matches