Additions to [FXOS-194] New apps-to-queries mapping