Queries return types substitution, new action and widget queries