Fix for issue #3: Conditonal query parameters