Improved Detection of Norovirus and Hepatitis A Virus in Surface Water by Applying Pre-PCR Processing