added expaned queries