Typo fix
Add ALWAYS_RETURN_ALL_FIELDS
Whitespace fix.