Added Contest Year to the Filter instead of the query and balanced the boost of the query, so searches on both country and artist / song will correctly sort the results