Workaround for invalid field names and fixing logic when no limit is placed on number of rows when ffetching stored fields