fixup! support functions in select-list on queries that do pk lookups