query builder macro definition capability added.