Refactor Rbs_Elasticsearch blocks.