Bug fix to ensure Patient Encounter Queries and Patient Person Queries that wrap underlying definitions also expose the parameters of those definitions