Expanded query module