added identifier to all tables and also changed queries