Enhance block query