Javier changes
some fixes for Record data