Working on few fixes. Try to reduce load on the database.