Query generator: extension form related fixes - inner join extension form with record entries table