Merge pull request #8 from tzh/master

many updates
Merge pull request #10 from tzh/master

some updates and fixes #9
searching for entities in search block