Fixes for when a query string is "nil"