Fixed "Column 'Value' does not belong to table." exception.
Small improvements