Fixed block selectors
Merge branch 'features/limit-block-handler'