updated to also analyze on commandText property