Miscellaneous updates to parsing of F$01 query information.