Aded killing slow quieries