(#61673544) Check queries 

https://www.pivotaltracker.com/story/show/61673544