Few new updates

Few fixes and database query file included