Add more complex query to test