Expanded query support out further