Changed location of erbi_temp_db and erbi_temp_db_helpers
Added minor corrections and code refactor