Improve 'pdsfq', avoid some dupes and handle fn flags ##print

Improve 'pdsfq', avoid some dupes and handle fn flags ##print #21852