Bug 16895 [QA Followup] - Use q{} for empty string as per PBP