Fixes in story queries
Merge