added quieries improved count