Feature/rails3 fix block finding

Also added missing data migration for adapting block keys