And another one query count optimization commit