Fixes: comments and adding checks for fields in QueryStatusEncoding