Enhance/fix blocks query && form