The recommended query working
Fixed merge errors