Fixes for query format and wording for error log