fix for bug 2613

Conflicts:
	src/analytics/db_handler.cc
	src/analytics/test/db_handler_test.cc
	src/query_engine/where_query.cc
move object id to column name