remove queries, these are now done by ids models + nest dbpedia info +cleanup
check for nil
add country info for query to model + general cleanup of debug code