Added macros SQL expansion also for Commands and SELECT statement in CreateRowSet