Merge pull request #1 from anmi/master

Fixed multiple blocks of the same type.
fixed search elements inside