Fixing issue with command and query builder.